From 4bbee9de895028d68f9ae511c51cac3984b6794c Mon Sep 17 00:00:00 2001 From: gaby Date: Mon, 23 Nov 2020 18:35:03 +0100 Subject: [PATCH] update --- workflow/rechnungseingang-de-1.0.1.bpmn | 476 ++++++++++++++++-------- workflow/sepa-export-3.0.1.bpmn | 2 +- 2 files changed, 328 insertions(+), 150 deletions(-) diff --git a/workflow/rechnungseingang-de-1.0.1.bpmn b/workflow/rechnungseingang-de-1.0.1.bpmn index 1894077..5533774 100644 --- a/workflow/rechnungseingang-de-1.0.1.bpmn +++ b/workflow/rechnungseingang-de-1.0.1.bpmn @@ -59,7 +59,6 @@ ExclusiveGateway_3 - ExclusiveGateway_5 IntermediateCatchEvent_2 ExclusiveGateway_6 IntermediateCatchEvent_5005-20 @@ -67,6 +66,7 @@ Task_5005 IntermediateCatchEvent_5005-10 IntermediateCatchEvent_5005-30 + ExclusiveGateway_5 Task_5000 @@ -80,15 +80,18 @@ Task_3 IntermediateThrowEvent_4 IntermediateCatchEvent_7 - EndEvent_2 - Task_5 - IntermediateCatchEvent_8 - Task_4 - EndEvent_1 - IntermediateCatchEvent_12 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 @@ -99,7 +102,7 @@ IntermediateCatchEvent_1 - + @@ -291,7 +294,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com SequenceFlow_0 - + @@ -698,7 +701,7 @@ result.isValid=true; SequenceFlow_20 - + @@ -718,9 +721,7 @@ result.isValid=true; true - - - + @@ -735,7 +736,6 @@ result.isValid=true; $workflowgroup - $workflowstatus]]> SequenceFlow_4 - SequenceFlow_27 SequenceFlow_55 SequenceFlow_22 @@ -930,8 +930,8 @@ Betrag: _amount (Brutto € _amount_brutto $workflowgroup - $workflowstatus]]> - SequenceFlow_23 SequenceFlow_25 + SequenceFlow_44 SequenceFlow_47 @@ -940,7 +940,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -955,7 +955,7 @@ Betrag: _amount (Brutto € _amount_brutto - + _amount (Brutto € _amount_brutto - namcurrenteditor.]]> + false - SequenceFlow_55 SequenceFlow_12 + @@ -1325,81 +1325,10 @@ result.isValid=true; workitem['payment.type'] && workitem['payment.type'][0]=="sepa_transfer" - + !workitem['payment.type'] || workitem['payment.type'][0]!="sepa_transfer" - - - - - - - - - - _subject]]> - - - - - - - - - _amount (Brutto € _amount_brutto) -_description]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home]]> - - - - - - - - - namcurrenteditor.]]> - - - false - - - SequenceFlow_27 - - - @@ -1474,7 +1403,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -1747,7 +1676,7 @@ result.isValid=true; SequenceFlow_39 - + @@ -1859,6 +1788,217 @@ result.isValid=true; 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. @@ -1873,9 +2013,9 @@ result.isValid=true; - + - + @@ -1897,9 +2037,9 @@ result.isValid=true; - + - + @@ -1991,7 +2131,7 @@ result.isValid=true; - + @@ -2011,21 +2151,21 @@ result.isValid=true; - + - + - + - + - + @@ -2041,7 +2181,7 @@ result.isValid=true; - + @@ -2107,15 +2247,9 @@ result.isValid=true; - + - - - - - - - + @@ -2155,21 +2289,21 @@ result.isValid=true; - + - + - + - + - + - + @@ -2178,6 +2312,30 @@ result.isValid=true; + + + + + + + + + + + + + + + + + + + + + + + + @@ -2251,9 +2409,9 @@ result.isValid=true; - - - + + + @@ -2284,8 +2442,8 @@ result.isValid=true; - - + + @@ -2313,17 +2471,17 @@ result.isValid=true; - + - - + + - + @@ -2395,30 +2553,24 @@ result.isValid=true; - - + + - + - - - - + + + + - - + + - - - - - - @@ -2451,21 +2603,22 @@ result.isValid=true; - + + - - - + + + - - - + + + @@ -2481,6 +2634,31 @@ result.isValid=true; + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/workflow/sepa-export-3.0.1.bpmn b/workflow/sepa-export-3.0.1.bpmn index 9a78802..387dcb8 100644 --- a/workflow/sepa-export-3.0.1.bpmn +++ b/workflow/sepa-export-3.0.1.bpmn @@ -422,7 +422,7 @@ Please check the process: Rechnungscontrolling (^rechnungseingang) - 5800 + 5500 300 ]]>