diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/form_basic.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/form_basic.xhtml
index c02390a..171a2ed 100644
--- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/form_basic.xhtml
+++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/form_basic.xhtml
@@ -21,6 +21,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/workflow/rechnungseingang-de-1.0.1-old.bpmn b/workflow/rechnungseingang-de-1.0.1-old.bpmn
new file mode 100644
index 0000000..b818262
--- /dev/null
+++ b/workflow/rechnungseingang-de-1.0.1-old.bpmn
@@ -0,0 +1,2683 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ExclusiveGateway_4
+ Task_2
+ ExclusiveGateway_1
+ StartEvent_1
+ IntermediateCatchEvent_3
+ IntermediateCatchEvent_13
+ IntermediateCatchEvent_5
+ IntermediateThrowEvent_3
+ IntermediateCatchEvent_5000-20
+ IntermediateCatchEvent_6
+
+
+ ExclusiveGateway_3
+ IntermediateCatchEvent_2
+ ExclusiveGateway_6
+ IntermediateCatchEvent_5005-20
+ EventBasedGateway_2
+ Task_5005
+ IntermediateCatchEvent_5005-10
+ IntermediateCatchEvent_5005-30
+ ExclusiveGateway_5
+
+
+ Task_5000
+ EventBasedGateway_4
+ IntermediateCatchEvent_16
+ IntermediateCatchEvent_15
+ IntermediateThrowEvent_1
+ IntermediateCatchEvent_5000-10
+
+
+ Task_3
+ IntermediateThrowEvent_4
+ IntermediateCatchEvent_7
+ IntermediateCatchEvent_17
+ ExclusiveGateway_2
+ IntermediateCatchEvent_4
+ Task_6
+ Task_7
+ IntermediateCatchEvent_18
+ Task_5
+ EndEvent_2
+ EndEvent_1
+ IntermediateCatchEvent_12
+ Task_4
+ IntermediateCatchEvent_14
+
+
+ IntermediateCatchEvent_9
+ Task_1
+ IntermediateCatchEvent_11
+ IntermediateThrowEvent_5
+ IntermediateCatchEvent_10
+ IntermediateCatchEvent_1
+
+
+
+
+
+
+
+
+ txtlastcomment]]>
+
+
+
+
+
+
+
+
+ cdtr.name invoice.number (invoice.currency invoice.total) space.name]]>
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $workflowgroup - $workflowstatus]]>
+ SequenceFlow_31
+ SequenceFlow_1
+ SequenceFlow_32
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+ SequenceFlow_31
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home]]>
+
+
+
+
+
+
+
+
+ space.name]]>
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_2
+ SequenceFlow_24
+
+
+ SequenceFlow_0
+ SequenceFlow_15
+ SequenceFlow_21
+ SequenceFlow_33
+
+
+
+ SequenceFlow_0
+
+
+
+
+
+
+
+
+ txtlastcomment]]>
+
+
+
+
+
+
+
+
+ cdtr.name invoice.number (invoice.currency invoice.total) space.name]]>
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $workflowgroup - $workflowstatus]]>
+ SequenceFlow_38
+ SequenceFlow_34
+ SequenceFlow_37
+
+
+
+
+
+
+
+
+
+
+
+ _subject]]>
+
+
+
+
+
+
+
+
+ _amount (Brutto € _amount_brutto)
+_description]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home
+- space.name
]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+ 0 && (parseFloat(a)!=parseFloat(b)) ) {
+ result.isValid=false;
+ result.errorMessage="Der Rechnungsbetrag " + a+ " stimmt nicht mit dem Positionsbetrag " + b + " überein.";
+ }]]>
+
+
+
+ SequenceFlow_8
+ SequenceFlow_51
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+ SequenceFlow_38
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home
+- space.name
]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_10
+ SequenceFlow_41
+
+
+ SequenceFlow_37
+ SequenceFlow_8
+ SequenceFlow_10
+
+
+
+
+
+
+
+
+
+ txtlastcomment]]>
+
+
+
+
+
+
+
+
+ cdtr.name invoice.number (invoice.currency invoice.total) space.name]]>
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $workflowgroup - $workflowstatus]]>
+ SequenceFlow_33
+ SequenceFlow_20
+ SequenceFlow_2
+ SequenceFlow_3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_20
+
+
+
+
+
+
+
+
+ txtlastcomment]]>
+
+
+
+
+
+
+
+
+ cdtr.name invoice.number (invoice.currency invoice.total) space.name]]>
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $workflowgroup - $workflowstatus]]>
+ SequenceFlow_4
+ SequenceFlow_55
+ SequenceFlow_22
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_29
+ SequenceFlow_52
+
+
+ SequenceFlow_32
+ SequenceFlow_29
+ SequenceFlow_30
+
+
+
+
+
+
+
+
+
+
+ _subject]]>
+
+
+
+
+
+
+
+
+ _amount (Brutto € _amount_brutto)
+_description]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+ SequenceFlow_30
+ SequenceFlow_7
+
+
+
+
+
+
+
+
+
+
+ txtlastcomment]]>
+
+
+
+
+
+
+
+
+ cdtr.name invoice.number (invoice.currency invoice.total) space.name]]>
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $workflowgroup - $workflowstatus]]>
+ SequenceFlow_25
+ SequenceFlow_44
+ SequenceFlow_47
+
+
+ SequenceFlow_47
+
+
+
+
+
+
+
+
+
+
+
+
+
+ _subject]]>
+
+
+
+
+
+
+
+
+ _amount (Brutto € _amount_brutto)
+_description]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+ SequenceFlow_55
+ SequenceFlow_12
+
+
+
+
+
+
+ SequenceFlow_24
+ SequenceFlow_13
+ SequenceFlow_16
+
+
+ workitem['space.team'] && workitem['space.team'][0]!=""
+
+
+ !workitem['space.team'] || workitem['space.team'][0]==""
+
+
+ SequenceFlow_18
+ SequenceFlow_1
+ SequenceFlow_5
+
+
+ workitem['process.manager'] && workitem['process.manager'][0]!=""
+
+
+ SequenceFlow_7
+ SequenceFlow_5
+ SequenceFlow_4
+
+
+
+ !workitem['process.manager'] || workitem['process.manager'][0]==""
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+ SequenceFlow_6
+ SequenceFlow_18
+
+
+ SequenceFlow_51
+ SequenceFlow_16
+ SequenceFlow_6
+
+
+
+ SequenceFlow_15
+
+
+
+
+ SequenceFlow_52
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_3
+ SequenceFlow_9
+
+
+
+ SequenceFlow_9
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_22
+ SequenceFlow_17
+
+
+ SequenceFlow_17
+
+
+
+
+
+ SequenceFlow_12
+ SequenceFlow_19
+ SequenceFlow_25
+
+
+
+
+
+
+
+
+
+
+ SequenceFlow_19
+ SequenceFlow_23
+
+
+
+ workitem['payment.type'] && workitem['payment.type'][0]=="sepa_transfer"
+
+
+
+ !workitem['payment.type'] || workitem['payment.type'][0]!="sepa_transfer"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+- Rechnungscontrolling
]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+ SequenceFlow_21
+
+
+
+
+
+
+
+
+
+
+ txtlastcomment]]>
+
+
+
+
+
+
+
+
+ cdtr.name invoice.number (invoice.currency invoice.total) space.name]]>
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $workflowgroup - $workflowstatus]]>
+ SequenceFlow_13
+ SequenceFlow_26
+ SequenceFlow_41
+ SequenceFlow_11
+ SequenceFlow_28
+ SequenceFlow_36
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+ SequenceFlow_26
+
+
+
+
+
+
+
+
+
+
+
+ _subject]]>
+
+
+
+
+
+
+
+
+ _amount (Brutto € _amount_brutto)
+_description]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home
+- space.name
]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_28
+ SequenceFlow_34
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home
+- space.name
]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ SequenceFlow_36
+ SequenceFlow_35
+
+
+ SequenceFlow_35
+
+
+
+
+
+ SequenceFlow_39
+
+
+
+
+
+
+
+
+ txtlastcomment]]>
+
+
+
+
+
+
+
+
+ cdtr.name invoice.number (invoice.currency invoice.total) space.name]]>
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $workflowgroup - $workflowstatus]]>
+ SequenceFlow_39
+ SequenceFlow_40
+
+
+ SequenceFlow_40
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home]]>
+
+
+
+
+
+
+
+
+ space.name]]>
+
+
+ false
+
+
+
+ SequenceFlow_11
+
+
+
+
+
+
+
+
+ txtlastcomment]]>
+
+
+
+
+
+
+
+
+ cdtr.name invoice.number (invoice.currency invoice.total) space.name]]>
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $workflowgroup - $workflowstatus]]>
+ SequenceFlow_23
+ SequenceFlow_14
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+ SequenceFlow_14
+ SequenceFlow_42
+
+
+
+
+
+
+
+
+
+
+ txtlastcomment]]>
+
+
+
+
+
+
+
+
+ cdtr.name invoice.number (invoice.currency invoice.total) space.name]]>
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $workflowgroup - $workflowstatus]]>
+ SequenceFlow_42
+ SequenceFlow_43
+
+
+
+
+
+
+
+
+
+
+ _subject]]>
+
+
+
+
+
+
+
+
+ _amount (Brutto € _amount_brutto)
+_description]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ home]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+ SequenceFlow_43
+ SequenceFlow_44
+
+
+
+
+
+ Wurde ein Prozess Manager festgelegt, erfolgt eine Genehmigung.
+
+
+
+ Die Rechnung wurde sachlich geprüft und genehmigt und kann nun in den Zahlungslauf übergeben werden.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/workflow/rechnungseingang-de-1.0.1.bpmn b/workflow/rechnungseingang-de-1.0.1.bpmn
index b818262..fbc8c5f 100644
--- a/workflow/rechnungseingang-de-1.0.1.bpmn
+++ b/workflow/rechnungseingang-de-1.0.1.bpmn
@@ -92,6 +92,7 @@
IntermediateCatchEvent_12
Task_4
IntermediateCatchEvent_14
+ IntermediateCatchEvent_8
IntermediateCatchEvent_9
@@ -632,8 +633,7 @@ result.isValid=true;
-
-
+
]]>
@@ -1310,7 +1310,7 @@ result.isValid=true;
-
+
SequenceFlow_12
SequenceFlow_19
SequenceFlow_25
@@ -1323,17 +1323,20 @@ result.isValid=true;
+
+
+
SequenceFlow_19
SequenceFlow_23
- workitem['payment.type'] && workitem['payment.type'][0]=="sepa_transfer"
+ workitem['payment.type'] && workitem['payment.type'][0]!="direct_debit"
- !workitem['payment.type'] || workitem['payment.type'][0]!="sepa_transfer"
+ !workitem['payment.type'] || workitem['payment.type'][0]=="direct_debit"
@@ -1839,6 +1842,7 @@ result.isValid=true;
$workflowgroup - $workflowstatus]]>
SequenceFlow_23
+ SequenceFlow_45
SequenceFlow_14
@@ -1941,6 +1945,7 @@ result.isValid=true;
$workflowgroup - $workflowstatus]]>
SequenceFlow_42
SequenceFlow_43
+ SequenceFlow_27
@@ -2015,6 +2020,17 @@ Betrag: _amount (Brutto € _amount_brutto
+
+
+
+
+
+
+ SequenceFlow_27
+ SequenceFlow_45
+
+
+
Wurde ein Prozess Manager festgelegt, erfolgt eine Genehmigung.
@@ -2352,6 +2368,12 @@ Betrag: _amount (Brutto € _amount_brutto
+
+
+
+
+
+
@@ -2675,6 +2697,18 @@ Betrag: _amount (Brutto € _amount_brutto
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/workflow/sepa-export-3.0.1.bpmn b/workflow/sepa-export-3.0.1.bpmn
index 67838f7..055a368 100644
--- a/workflow/sepa-export-3.0.1.bpmn
+++ b/workflow/sepa-export-3.0.1.bpmn
@@ -154,7 +154,7 @@ Please check the process:
- $created (dbtr.iban / dbtr.bic)]]>
+ $created (payment.type)]]>
true
@@ -256,7 +256,7 @@ Please check the process:
- $created (dbtr.iban / dbtr.bic)]]>
+ $created (payment.type)]]>
@@ -296,7 +296,7 @@ Please check the process:
- $created (dbtr.iban / dbtr.bic)]]>
+ $created (payment.type)]]>
true
@@ -340,7 +340,7 @@ Please check the process:
- $created (dbtr.iban / dbtr.bic)]]>
+ $created (payment.type)]]>
true