diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export.xhtml index ad62a28..82727bb 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export.xhtml @@ -43,7 +43,11 @@ - #{invoice.item['cdtr.name']} + + #{invoice.item['cdtr.name']} + + + #{invoice.item['invoice.number']} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ExclusiveGateway_4 + Task_2 + ExclusiveGateway_1 + StartEvent_1 + IntermediateCatchEvent_3 + IntermediateCatchEvent_13 + IntermediateCatchEvent_5 + IntermediateThrowEvent_3 + IntermediateCatchEvent_5000-20 + IntermediateCatchEvent_6 + + + ExclusiveGateway_3 + ExclusiveGateway_5 + IntermediateCatchEvent_2 + ExclusiveGateway_6 + IntermediateCatchEvent_5005-20 + EventBasedGateway_2 + Task_5005 + IntermediateCatchEvent_5005-10 + IntermediateCatchEvent_5005-30 + + + Task_5000 + EventBasedGateway_4 + IntermediateCatchEvent_16 + IntermediateCatchEvent_15 + IntermediateThrowEvent_1 + IntermediateCatchEvent_5000-10 + + + Task_3 + IntermediateThrowEvent_4 + IntermediateCatchEvent_7 + IntermediateCatchEvent_8 + IntermediateCatchEvent_17 + ExclusiveGateway_2 + Task_6 + IntermediateCatchEvent_14 + Task_5 + EndEvent_2 + IntermediateCatchEvent_12 + Task_4 + EndEvent_1 + IntermediateCatchEvent_4 + + + 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 + + + + 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_27 + 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_42 + SequenceFlow_47 + + + SequenceFlow_47 + + + + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + namcurrenteditor.]]> + + + 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" + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + namcurrenteditor.]]> + + + false + + + SequenceFlow_27 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +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 + + + + + + + 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/sepa-export-3.0.1.bpmn b/workflow/sepa-export-3.0.1.bpmn index 73f199e..9a78802 100644 --- a/workflow/sepa-export-3.0.1.bpmn +++ b/workflow/sepa-export-3.0.1.bpmn @@ -56,18 +56,12 @@ Please check the process: - - - - Scheduled once a day - - - Instances are created grouped by IBAN. + The linked invoice workitem will be processed by a configurable event. - + @@ -86,7 +80,6 @@ Please check the process: IntermediateCatchEvent_4 IntermediateCatchEvent_1 IntermediateCatchEvent_18 - IntermediateCatchEvent_9 @@ -142,7 +135,7 @@ Please check the process: - namcurrenteditor.]]> + $editor.]]> false @@ -384,7 +377,6 @@ Please check the process: SEPA_Export_success]]> SequenceFlow_11 - SequenceFlow_19 SequenceFlow_28 SequenceFlow_13 @@ -429,8 +421,8 @@ Please check the process: Rechnungscontrolling - (^sepa-export) - 210 + (^rechnungseingang) + 5800 300 ]]> @@ -440,7 +432,7 @@ Please check the process: - + @@ -493,7 +485,7 @@ Please check the process: - namcurrenteditor.]]> + $editor.]]> false @@ -504,377 +496,79 @@ Please check the process: SequenceFlow_2 - - SequenceFlow_19 - - - - - - - StartEvent_2 - Task_3 - IntermediateCatchEvent_6 - EndEvent_1 - Task_5 - Task_4 - IntermediateCatchEvent_7 - IntermediateCatchEvent_8 - - - - SequenceFlow_20 - - - - - - - - - - - Rechnungscontrolling -]]> - - - - - - SequenceFlow_21 - SequenceFlow_26 - - - - - - cdtr.iban invoice.number]]> - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - SequenceFlow_20 - SequenceFlow_21 - - - SequenceFlow_25 - - - - - - - cdtr.iban invoice.number]]> - - - true - - - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_14 - SequenceFlow_18 - SequenceFlow_25 - - - - - - - cdtr.iban invoice.number]]> - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_26 - SequenceFlow_12 - SequenceFlow_3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1]]> - - - - - - - - - - - - - - - false - - - SequenceFlow_12 - SequenceFlow_14 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - home]]> - - - - - - namcurrenteditor.]]> - - - false - - - - SequenceFlow_3 - SequenceFlow_18 - - - + + The SEPA Export holds a list of referncees to all invoices in the item '$workitemref' + +Instances are created grouped by IBAN. + +The SEPA Export process runs on a scheduled basis (e.g. once a day) + + - + - - - - - - - + - + - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - + - + - + @@ -890,15 +584,15 @@ Please check the process: - + - + - + - + @@ -914,245 +608,136 @@ Please check the process: - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - + + + - - - + + + - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -