diff --git a/workflow/templates/contract-en-1.0.0.bpmn b/workflow/templates/contract-en-1.0.0.bpmn
index 1bf9d6f..98897a8 100644
--- a/workflow/templates/contract-en-1.0.0.bpmn
+++ b/workflow/templates/contract-en-1.0.0.bpmn
@@ -90,7 +90,7 @@
+ options = "Internal Rent; External Rent;Purchase;Sales;Insurance;Lease" required="true"/>
@@ -109,10 +109,6 @@
-
-
]]>
@@ -122,7 +118,7 @@
- contract.type]]>
+ contract.type - contract.id plate.number]]>
@@ -137,12 +133,12 @@
-
- contract.type]]>
-
+
+ contract.type - contract.id plate.number]]>
+
sequenceFlow_GlkseQ
@@ -225,12 +221,12 @@
-
- contract.name]]>
-
+
+ contract.type - contract.id plate.number]]>
+
sequenceFlow_Unq1BA
@@ -280,7 +276,7 @@
- contract.name ]]>
+ contract.type - contract.id plate.number]]>
@@ -354,7 +350,7 @@ thanks for contacting us. We cant go forward with your enquiry due to missing ma
- contract.name]]>
+ contract.type - contract.id plate.number]]>
@@ -394,12 +390,12 @@ thanks for contacting us. We cant go forward with your enquiry due to missing ma
-
- contract.name]]>
-
+
+ contract.type - contract.id plate.number]]>
+
sequenceFlow_MZKczw
@@ -421,7 +417,7 @@ thanks for contacting us. We cant go forward with your enquiry due to missing ma
- contract.type]]>
+ contract.type - contract.id plate.number]]>
diff --git a/workflow/templates/finemanagement-en-1.0.2.bpmn b/workflow/templates/finemanagement-en-1.0.2.bpmn
index 655e06b..b5d05ec 100644
--- a/workflow/templates/finemanagement-en-1.0.2.bpmn
+++ b/workflow/templates/finemanagement-en-1.0.2.bpmn
@@ -46,8 +46,6 @@
event_0ut6OQ
- event_1i00bQ
- dataObject_5JjCxw
task_gUqlBw
event_IoSRSA
task_0nO4bg
@@ -60,8 +58,11 @@
event_sc12QA
task_96s6Qg
event_Ldvexw
+ event_h1nYXQ
+ dataObject_5JjCxw
+ event_1i00bQ
-
+
dataObject_5Bqd2g
task_Un4fdQ
@@ -87,6 +88,7 @@
event_RnD1Ig
event_UOr0Hw
event_52zfhw
+ event_S09evw
@@ -109,32 +111,41 @@
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
+ options="Overspeed;illegalparking;tailgating;Overtaking" span="4"/>
+
+
-
-
+
+
-
-
-
-
-
+ options="EUR;CHF;SEK;NOK;GBP;USD" span="4"/>
+
+
+
+
+
]]>
@@ -149,7 +160,7 @@
sequenceFlow_px0OYQ
- sequenceFlow_uw0aQQ
+ sequenceFlow_WTisrg
@@ -201,21 +212,30 @@
- sequenceFlow_uw0aQQ
+ sequenceFlow_DFkqqQ
sequenceFlow_xbNqbA
sequenceFlow_ueLOmA
-
-
-
-
+
+
+
+ [contract.ref]
+ (^customer\.)|(^contract\.)|(^plate\.)
+ false
+
+
+]]>
+
+
+
+
sequenceFlow_ueLOmA
@@ -296,10 +316,23 @@
fine.violation.date.Our systems recorded your vehicle at fine.location.country ;fine.vioalition.location Location of Violation committing the following offense: fine.category.name.Violation SummaryNotice for Vehicle Plate:plate.number Fine Amount: fine.amount Due Date: payment.duedate from receipt.
+
+
+
Best regards.
]]>
+
+
+ [contract.ref]
+ (^customer\.)|(^contract\.)|(^plate\.)
+ false
+
+fine.category.name
+fine.violation.date
+fine.location.description]]>
+
sequenceFlow_0R4Pbg
@@ -308,7 +341,7 @@ Best regards.
-
+
@@ -447,18 +480,25 @@ if ( workitem.getItemValueString('comment.user')==='' ) {
plate.number]]>
-
-
-
driver.name is sent.]]>
+
+ fine.violation.date.Our systems recorded your vehicle at fine.location.country ;fine.vioalition.location Location of Violation committing the following offense: fine.category.name.Violation SummaryNotice for Vehicle Plate:plate.number Fine Amount: fine.amount Due Date: payment.duedate from receipt.
+
+Since you crossed the due date an additinal charges are added to your amount.
+
+
+
+Best regards.
+]]>
+
-
+
sequenceFlow_qM5UDw
@@ -488,26 +528,26 @@ Best regards.]]>
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
]]>
@@ -573,10 +613,10 @@ Transactions details are complete.]]>
- sequenceFlow_VYzBsQ
+ sequenceFlow_y58TKQ
sequenceFlow_qGLQLQ
-
+
@@ -593,20 +633,20 @@ Transactions details are complete.]]>
-
+
-
+
-
+
-
+
-
+
@@ -621,7 +661,7 @@ Transactions details are complete.]]>
-
+
]]>
@@ -713,9 +753,9 @@ Best regards.
- sequenceFlow_SI6J9Q
sequenceFlow_wL8TEg
+ sequenceFlow_0ZGQ4g
@@ -724,8 +764,8 @@ Best regards.
- sequenceFlow_0ZGQ4g
- sequenceFlow_SI6J9Q
+ sequenceFlow_wL8TEg
+ sequenceFlow_O6znhA
@@ -741,17 +781,17 @@ Best regards.
-
+
-
-
-
-
+
+
+
+
sequenceFlow_frNzNg
@@ -770,9 +810,6 @@ Best regards.
-
-
-
@@ -799,13 +836,85 @@ Best regards.
-
+
- sequenceFlow_wL8TEg
+ sequenceFlow_O6znhA
-
+
+
+
+
+
+
+
+
+ [contract.ref]
+ (^customer\.)|(^contract\.)|(^plate\.)
+ false
+
+
+]]>
+
+
+
+
+
+
+ sequenceFlow_WTisrg
+ sequenceFlow_DFkqqQ
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ fine.id fine.category.name correction]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ sequenceFlow_y58TKQ
+
+ sequenceFlow_VYzBsQ
+
+
+
+
@@ -822,360 +931,383 @@ Best regards.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/workflow/templates/orderenquiry-eu-en-1.0.0.bpmn b/workflow/templates/orderenquiry-eu-en-1.0.0.bpmn
index 9aa0040..8551109 100644
--- a/workflow/templates/orderenquiry-eu-en-1.0.0.bpmn
+++ b/workflow/templates/orderenquiry-eu-en-1.0.0.bpmn
@@ -180,7 +180,7 @@
- [payment.ref
+ ][customer.ref
customer.name, customer.number
false
]]>]