diff --git a/workflow/rechnungsausgang-de-1.0.0.bpmn b/workflow/rechnungsausgang-de-1.0.0.bpmn index 9a6ec18..1a86ddb 100644 --- a/workflow/rechnungsausgang-de-1.0.0.bpmn +++ b/workflow/rechnungsausgang-de-1.0.0.bpmn @@ -53,16 +53,17 @@ Task_5 IntermediateCatchEvent_12 IntermediateCatchEvent_13 - EventBasedGateway_1 IntermediateCatchEvent_23 EndEvent_2 ExclusiveGateway_2 IntermediateCatchEvent_5000-20 - IntermediateCatchEvent_17 - ExclusiveGateway_4 IntermediateThrowEvent_3 + IntermediateCatchEvent_17 + IntermediateCatchEvent_2 + IntermediateCatchEvent_3 IntermediateCatchEvent_18 - IntermediateCatchEvent_1 + ExclusiveGateway_5 + EventBasedGateway_1 Task_3 @@ -314,8 +315,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com $workflowgroup - $workflowstatus]]> SequenceFlow_33 SequenceFlow_20 - SequenceFlow_44 - SequenceFlow_6 + SequenceFlow_14 SequenceFlow_39 SequenceFlow_46 SequenceFlow_2 @@ -456,7 +456,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com $workflowgroup - $workflowstatus]]> SequenceFlow_52 SequenceFlow_13 - SequenceFlow_45 + SequenceFlow_11 SequenceFlow_47 @@ -515,8 +515,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - -false]]> + Rechnungscontrolling]]> @@ -696,6 +695,7 @@ result.isValid=true; SequenceFlow_59 SequenceFlow_31 SequenceFlow_40 + SequenceFlow_16 SequenceFlow_40 @@ -751,6 +751,7 @@ result.isValid=true; SequenceFlow_39 SequenceFlow_19 SequenceFlow_57 + SequenceFlow_17 @@ -1005,6 +1006,7 @@ result.isValid=true; SequenceFlow_3 SequenceFlow_29 SequenceFlow_30 + SequenceFlow_7 @@ -1136,7 +1138,7 @@ Betrag: _amount (Brutto € _amount_brutto - + false @@ -1212,9 +1214,7 @@ Betrag: _amount (Brutto € _amount_brutto - -$editor -space.name]]> + ]]> @@ -1256,7 +1256,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -1307,8 +1307,7 @@ Betrag: invoice.total invoice.currency home -false -Wollen Sie den Vorgang wirklich archivieren?]]> +]]> @@ -1335,7 +1334,7 @@ Betrag: invoice.total invoice.currency - + @@ -1385,9 +1384,7 @@ Betrag: invoice.total invoice.currency - home -false -Wollen Sie den Vorgang wirklich archivieren?]]> + home]]> @@ -1414,7 +1411,7 @@ Betrag: invoice.total invoice.currency - + @@ -1450,109 +1447,8 @@ Betrag: invoice.total invoice.currency - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - false - - - - - SequenceFlow_42 - SequenceFlow_43 - - - SequenceFlow_43 - SequenceFlow_44 - SequenceFlow_45 - - - - - - - - SequenceFlow_42 - - - - SequenceFlow_50 - - - - - - - - - SequenceFlow_58 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1583,28 +1479,97 @@ Betrag: invoice.total invoice.currency - - SequenceFlow_6 + SequenceFlow_42 + SequenceFlow_8 - + + + + SequenceFlow_42 + + + + SequenceFlow_50 + + + + + + + + + SequenceFlow_58 + + + + + + SequenceFlow_7 + + + + + SequenceFlow_8 + SequenceFlow_10 + SequenceFlow_12 + + + + + + invoice.saldo]]> + + + SequenceFlow_10 + SequenceFlow_11 + + + (parseFloat(workitem['invoice.saldo']) == parseFloat('0.0')) + + + + + + invoice.saldo]]> + + + SequenceFlow_12 + SequenceFlow_14 + + + + + SequenceFlow_16 + + + + + SequenceFlow_17 + + + + + Trigger über ZahlungseingangsSaldoAdapter + + - + - + - + @@ -1728,7 +1693,7 @@ Betrag: invoice.total invoice.currency - + @@ -1800,25 +1765,21 @@ Betrag: invoice.total invoice.currency - + - + - - - - - + - + - + @@ -1827,10 +1788,44 @@ Betrag: invoice.total invoice.currency - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1842,19 +1837,21 @@ Betrag: invoice.total invoice.currency - + + - + + - - + + @@ -1889,7 +1886,8 @@ Betrag: invoice.total invoice.currency - + + @@ -1919,7 +1917,7 @@ Betrag: invoice.total invoice.currency - + @@ -1975,8 +1973,9 @@ Betrag: invoice.total invoice.currency - - + + + @@ -1987,40 +1986,22 @@ Betrag: invoice.total invoice.currency - + - - + + - - - + + + - - - - - - - - - - - - - - - - - - @@ -2046,8 +2027,8 @@ Betrag: invoice.total invoice.currency - - + + @@ -2066,11 +2047,62 @@ Betrag: invoice.total invoice.currency - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/workflow/zahlungseingang-de-1.0.0.bpmn b/workflow/zahlungseingang-de-1.0.0.bpmn index 052e709..c2e893c 100644 --- a/workflow/zahlungseingang-de-1.0.0.bpmn +++ b/workflow/zahlungseingang-de-1.0.0.bpmn @@ -47,14 +47,13 @@ ]]> - + - IntermediateCatchEvent_18 IntermediateCatchEvent_5 Task_6 Task_2 @@ -119,7 +118,7 @@ - $editor.]]> + false @@ -135,7 +134,7 @@ result.isValid=true; }]]> - $editor]]> + SequenceFlow_13 SequenceFlow_18 @@ -145,7 +144,7 @@ result.isValid=true; - $created - payment.total payment.currency (dbtr.number - dbtr.name)]]> + $lasteventdate - payment.total payment.currency (dbtr.number - dbtr.name)]]> true @@ -170,15 +169,15 @@ result.isValid=true; $workflowgroup - $workflowstatus]]> - SequenceFlow_2 SequenceFlow_6 + SequenceFlow_3 SequenceFlow_10 SequenceFlow_1 SequenceFlow_13 - SequenceFlow_8 + SequenceFlow_5 SequenceFlow_10 @@ -187,7 +186,7 @@ result.isValid=true; - $created - payment.total payment.currency (dbtr.number - dbtr.name)]]> + $lasteventdate - payment.total payment.currency (dbtr.number - dbtr.name)]]> @@ -219,14 +218,13 @@ result.isValid=true; $workflowgroup - $workflowstatus]]> SequenceFlow_14 SequenceFlow_4 - SequenceFlow_3 SequenceFlow_1 - $created - payment.total payment.currency (dbtr.number - dbtr.name)]]> + $lasteventdate - payment.total payment.currency (dbtr.number - dbtr.name)]]> true @@ -256,103 +254,6 @@ result.isValid=true; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Zahlugnsavis Template - zahlungsavis_template.xlsx -zahlungsavis_numsequencenumber.xlsx - - - E2 - Person in Charge: $editor - text - - - E5 - $editor - text - - - C10 - numsequencenumber - text - - - A12 - cdtr.number - text - - - B12 - cdtr.name.cargosoft - text - - - F10 - $modified - date - ]]> - - - - - - $editor.]]> - - - false - - - - SequenceFlow_8 - SequenceFlow_2 - - - @@ -416,7 +317,6 @@ result.isValid=true; SequenceFlow_6 - @@ -497,7 +397,7 @@ result.isValid=true; ]]> - + @@ -550,13 +450,14 @@ result.isValid=true; - + false - + + SequenceFlow_5 SequenceFlow_3 @@ -567,15 +468,32 @@ result.isValid=true; - + + + + + + + + + + + + + + +]]> + + + - + @@ -612,12 +530,6 @@ result.isValid=true; - - - - - - @@ -661,9 +573,15 @@ result.isValid=true; - + - + + + + + + + @@ -672,12 +590,6 @@ result.isValid=true; - - - - - - @@ -702,12 +614,6 @@ result.isValid=true; - - - - - - @@ -732,12 +638,24 @@ result.isValid=true; - - - - + + + + + + + + + + + + + + + +