From db815dea2334a670260e58b42bc8f5059be6f534 Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Tue, 5 Aug 2025 10:57:54 +0200 Subject: [PATCH] invoice export feature --- ...bpmn => invoice-ingoing-export-1.0.0.bpmn} | 334 ++---- .../usa/invoice-outgoing-export-1.0.0.bpmn | 954 ++++++++++++++++++ workflow/usa/rechnungsausgang-usa-1.0.1.bpmn | 146 ++- ...chnungseingang-sachrechnung-usa-1.0.0.bpmn | 60 +- workflow/usa/rechnungseingang-usa-1.0.0.bpmn | 341 +++---- 5 files changed, 1343 insertions(+), 492 deletions(-) rename workflow/usa/{invoice-export-1.0.0.bpmn => invoice-ingoing-export-1.0.0.bpmn} (78%) create mode 100644 workflow/usa/invoice-outgoing-export-1.0.0.bpmn diff --git a/workflow/usa/invoice-export-1.0.0.bpmn b/workflow/usa/invoice-ingoing-export-1.0.0.bpmn similarity index 78% rename from workflow/usa/invoice-export-1.0.0.bpmn rename to workflow/usa/invoice-ingoing-export-1.0.0.bpmn index 5918003..93be3e8 100644 --- a/workflow/usa/invoice-export-1.0.0.bpmn +++ b/workflow/usa/invoice-ingoing-export-1.0.0.bpmn @@ -2,7 +2,7 @@ - + @@ -49,7 +49,7 @@ ]]> - + @@ -57,11 +57,10 @@ - + - + IntermediateCatchEvent_6 - IntermediateCatchEvent_1 IntermediateCatchEvent_7 Task_2 ExclusiveGateway_1 @@ -69,28 +68,24 @@ StartEvent_2 IntermediateCatchEvent_2 IntermediateCatchEvent_18 - IntermediateCatchEvent_3 Task_7 Task_6 EndEvent_3 IntermediateCatchEvent_4 IntermediateCatchEvent_5 - textAnnotation_Ku1gIw TextAnnotation_2 TextAnnotation_3 - TextAnnotation_1 gateway_WuKeqQ gateway_6FAj9g - event_y4hmYg - event_WJfyAw dataObject_NlFnMg + event_NX3rQA - $created (dbtr.name)]]> + name]]> true @@ -130,7 +125,7 @@ - $created (dbtr.name)]]> + name]]> true @@ -158,7 +153,6 @@ $workflowgroup - $workflowstatus]]> SequenceFlow_17 SequenceFlow_19 - sequenceFlow_3uz0ww @@ -168,12 +162,11 @@ SequenceFlow_18 SequenceFlow_1 - sequenceFlow_0QFTlw - $created]]> + name]]> true @@ -210,36 +203,13 @@ $workflowgroup - $workflowstatus]]> SequenceFlow_12 - SequenceFlow_7 - SequenceFlow_6 - SequenceFlow_8 SequenceFlow_28 + sequenceFlow_x50o4w - - - - - - - - - - Invoice Controlling]]> - - - - - - SequenceFlow_7 - - - - - - + @@ -305,7 +275,6 @@ SequenceFlow_2 - sequenceFlow_rhKXDQ @@ -381,31 +350,10 @@ SequenceFlow_6 - + - - - - - - - - - - - - - - - - SequenceFlow_8 - - - - - - + @@ -458,7 +406,7 @@ - + false @@ -474,7 +422,7 @@ result.isValid=true; }]]> - + SequenceFlow_19 sequenceFlow_nyv4vw @@ -487,7 +435,7 @@ result.isValid=true; - $created]]> + name]]> @@ -527,7 +475,6 @@ result.isValid=true; SequenceFlow_11 SequenceFlow_9 SequenceFlow_4 - sequenceFlow_ANROcA @@ -624,7 +571,6 @@ result.isValid=true; DataOutput_2 - sequenceFlow_ePZrvQ @@ -767,17 +713,6 @@ Instances are created grouped - - - - - - - - - The linked invoice workitem will be added to thhe $workitemref - - SequenceFlow_18 @@ -799,86 +734,18 @@ Instances are created grouped - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - sequenceFlow_0QFTlw - - sequenceFlow_ePZrvQ - - - - - - - - - + + + + + + +]]> + + + - + @@ -922,7 +789,9 @@ Instances are created grouped - home]]> + +Rechnungscontrolling +invoice.date]]> @@ -931,43 +800,19 @@ Instances are created grouped - + false - - - - - sequenceFlow_3uz0ww - sequenceFlow_ANROcA + + SequenceFlow_6 + sequenceFlow_x50o4w - - + + - - - - - - - - - -]]> - - - - @@ -992,7 +837,7 @@ result.isValid=true; - + @@ -1001,21 +846,12 @@ result.isValid=true; - - - - - - - - - @@ -1026,7 +862,7 @@ result.isValid=true; - + @@ -1035,15 +871,9 @@ result.isValid=true; - + - - - - - - - + @@ -1062,7 +892,7 @@ result.isValid=true; - + @@ -1081,13 +911,6 @@ result.isValid=true; - - - - - - - @@ -1109,17 +932,11 @@ result.isValid=true; - + - - - - - - - - - + + + @@ -1149,10 +966,10 @@ result.isValid=true; - - - - + + + + @@ -1164,15 +981,6 @@ result.isValid=true; - - - - - - - - - @@ -1197,42 +1005,6 @@ result.isValid=true; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1244,6 +1016,16 @@ result.isValid=true; + + + + + + + + + + diff --git a/workflow/usa/invoice-outgoing-export-1.0.0.bpmn b/workflow/usa/invoice-outgoing-export-1.0.0.bpmn new file mode 100644 index 0000000..1277b10 --- /dev/null +++ b/workflow/usa/invoice-outgoing-export-1.0.0.bpmn @@ -0,0 +1,954 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + application.urlindex.jsf?workitem=$uniqueid + +]]> + + + application.urlindex.jsf?workitem=$uniqueid + +]]> + + + + + + + + + + + + + + IntermediateCatchEvent_6 + IntermediateCatchEvent_7 + Task_2 + ExclusiveGateway_1 + Task_1 + StartEvent_2 + IntermediateCatchEvent_2 + IntermediateCatchEvent_18 + Task_7 + Task_6 + EndEvent_3 + IntermediateCatchEvent_4 + IntermediateCatchEvent_5 + + TextAnnotation_2 + TextAnnotation_3 + gateway_WuKeqQ + gateway_6FAj9g + dataObject_NlFnMg + + + + + + $created (dbtr.name)]]> + + + true + + + + + + + + + + + + SEPA-Lauf
+Bank: dbtr.name
+Erstellt am: $created
+IBAN/Währung: name
+]]>
+
+ + + +
+ $workflowgroup - $workflowstatus]]> + SequenceFlow_2 + SequenceFlow_10 +
+ + + + + SequenceFlow_10 + SequenceFlow_17 + + + + + + $created (dbtr.name)]]> + + + true + + + + + + + + + + + + SEPA-Lauf
+Bank: dbtr.name
+Erstellt am: $created
+IBAN/Währung: name
+]]>
+
+ + + +
+ $workflowgroup - $workflowstatus]]> + SequenceFlow_17 + SequenceFlow_19 +
+ + + + + SequenceFlow_28 + SequenceFlow_18 + SequenceFlow_1 + + + + + + $created]]> + + + true + + + + + + + + + + + + + + + + + + + SEPA-Lauf
+Bank: dbtr.name
+Erstellt am: $created
+IBAN/Währung: name
+]]>
+
+ + + + + + +
+ $workflowgroup - $workflowstatus]]> + SequenceFlow_12 + SequenceFlow_6 + SequenceFlow_28 +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home + + (^rechnungseingang) + 5500 + 300 +]]> + + + + + + + + + false + + + + SequenceFlow_2 + + sequenceFlow_rhKXDQ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Rechnungscontrolling]]> + + + + + + + + + + + + false + + + + SequenceFlow_12 + + + + + + SequenceFlow_6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_19 + sequenceFlow_nyv4vw + + + + + + + + + + + $created]]> + + + + + + + + + + + + + + + + + + + SEPA-Lauf
+Bank: dbtr.name
+Erstellt am: $created
+IBAN/Währung: name
+]]>
+
+ + + + + + + + + +
+ $workflowgroup - $workflowstatus]]> + SequenceFlow_3 + SequenceFlow_11 + SequenceFlow_9 + SequenceFlow_4 +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SEPA-Body]]> + + + + + + + SequenceFlow_1 + SequenceFlow_3 + + + DataOutput_2 + + + DataOutput_2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + SEPA-Body]]> + + + + + + + SequenceFlow_11 + + + DataOutput_1 + + + DataOutput_1 + + + + + + + + + + + + + + + + + + + + + + SequenceFlow_9 + + + + + + + + + + + Contains Report Definition + + + + + + + + SequenceFlow_18 + sequenceFlow_yVyNRw + sequenceFlow_nyv4vw + + + + SequenceFlow_4 + sequenceFlow_rhKXDQ + sequenceFlow_yVyNRw + + + + + + + + + + + + + + + + +]]> + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/workflow/usa/rechnungsausgang-usa-1.0.1.bpmn b/workflow/usa/rechnungsausgang-usa-1.0.1.bpmn index 5252d94..a3de445 100644 --- a/workflow/usa/rechnungsausgang-usa-1.0.1.bpmn +++ b/workflow/usa/rechnungsausgang-usa-1.0.1.bpmn @@ -40,7 +40,7 @@
true
- + @@ -129,6 +129,8 @@ th { font-weight: bold;} task_LqbtSQ event_iUSXSg textAnnotation_ru52BA + event_xv09Ag + textAnnotation_bHjLKQ Task_1 @@ -230,7 +232,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com SequenceFlow_33 SequenceFlow_15 - sequenceFlow_2nyhqA + sequenceFlow_TgJDTQ @@ -1224,7 +1226,7 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht - + @@ -1264,6 +1266,97 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht association_xVkeww + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + (type:workitem) AND ($modelversion:invoice-outgoing-export*) + invoice-outgoing-export-1.0 + 1000 + 100 + true +]]> + + + + + + + + + + + + false + + + + + + sequenceFlow_2nyhqA + sequenceFlow_TgJDTQ + + + + + + + + + + + @@ -1294,9 +1387,9 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht - + - + @@ -1324,9 +1417,9 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht - + - + @@ -1396,9 +1489,9 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht - + - + @@ -1472,7 +1565,7 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht - + @@ -1542,8 +1635,8 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht - - + + @@ -1554,7 +1647,7 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht - + @@ -1654,11 +1747,11 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht - + - - - + + + @@ -1675,6 +1768,25 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht + + + + + + + + + + + + + + + + + + + diff --git a/workflow/usa/rechnungseingang-sachrechnung-usa-1.0.0.bpmn b/workflow/usa/rechnungseingang-sachrechnung-usa-1.0.0.bpmn index cc15b0e..be2626b 100644 --- a/workflow/usa/rechnungseingang-sachrechnung-usa-1.0.0.bpmn +++ b/workflow/usa/rechnungseingang-sachrechnung-usa-1.0.0.bpmn @@ -50,7 +50,7 @@ - + Task_2 @@ -487,7 +487,7 @@ Betrag: _amount (Brutto € _amount_bruttoSequenceFlow_20 SequenceFlow_22 - + @@ -810,7 +810,7 @@ result.isValid=true; - + @@ -2504,7 +2504,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -4374,13 +4374,13 @@ Betrag: _amount (Brutto € _amount_brutto - + - + @@ -4455,7 +4455,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -4509,7 +4509,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -4551,7 +4551,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -4617,7 +4617,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -4710,7 +4710,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -4737,7 +4737,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -4867,8 +4867,8 @@ Betrag: _amount (Brutto € _amount_brutto - - + + @@ -4988,8 +4988,8 @@ Betrag: _amount (Brutto € _amount_brutto - - + + @@ -5015,7 +5015,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -5126,8 +5126,8 @@ Betrag: _amount (Brutto € _amount_brutto - - + + @@ -5140,8 +5140,8 @@ Betrag: _amount (Brutto € _amount_brutto - - + + @@ -5173,8 +5173,8 @@ Betrag: _amount (Brutto € _amount_brutto - - + + @@ -5186,7 +5186,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -5217,11 +5217,11 @@ Betrag: _amount (Brutto € _amount_brutto - + - + @@ -5308,8 +5308,8 @@ Betrag: _amount (Brutto € _amount_brutto - - + + @@ -5352,8 +5352,8 @@ Betrag: _amount (Brutto € _amount_brutto - - + + diff --git a/workflow/usa/rechnungseingang-usa-1.0.0.bpmn b/workflow/usa/rechnungseingang-usa-1.0.0.bpmn index cae5e37..9dd6e51 100644 --- a/workflow/usa/rechnungseingang-usa-1.0.0.bpmn +++ b/workflow/usa/rechnungseingang-usa-1.0.0.bpmn @@ -99,8 +99,6 @@ IntermediateCatchEvent_21 EventBasedGateway_2 IntermediateCatchEvent_5005-20 - ExclusiveGateway_6 - IntermediateCatchEvent_2 IntermediateCatchEvent_26 IntermediateThrowEvent_2 Task_12 @@ -113,6 +111,8 @@ TextAnnotation_3 event_pAR6FQ event_FPc1AA + event_Xx9aYA + textAnnotation_ukV2Vg EndEvent_3 @@ -448,7 +448,7 @@ function oeffnefenster (url) { - + @@ -1063,7 +1063,7 @@ if (workitem['payment.type'][0]!="direct_debit" && workitem['payment.type'][0]! - + @@ -1158,101 +1158,19 @@ if (workitem['payment.type'][0]!="direct_debit" && workitem['payment.type'][0]! - SequenceFlow_18 SequenceFlow_1 SequenceFlow_68 + sequenceFlow_aH3q9g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - SequenceFlow_6 - SequenceFlow_18 - - - - SequenceFlow_51 - SequenceFlow_6 - - - - - SequenceFlow_126 - - - @@ -4713,10 +4631,10 @@ Betrag: _amount (Brutto € _amount_brutto - - Datenübergabe an Cargosoft. + + +Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export']]> @@ -4908,10 +4826,11 @@ Betrag: _amount (Brutto € _amount_brutto - (type:workitem) AND ($modelversion:invoice-export*) - invoice-export-1.0 + (type:workitem) AND ($modelversion:invoice-ingoing-export*) AND (name:"invoice.date") + invoice-ingoing-export-1.0 1000 100 + invoice.date true ]]> @@ -4989,7 +4908,7 @@ Betrag: _amount (Brutto € _amount_brutto - (type:workitem) AND ($modelversion:invoice-export*) + (type:workitem) AND ($modelversion:invoice-ingoing-export*) true ]]> @@ -5002,6 +4921,98 @@ Betrag: _amount (Brutto € _amount_brutto + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + (type:workitem) AND ($modelversion:invoice-ingoing-export*) AND (name:invoice.date) + invoice-ingoing-export-1.0 + 1000 + 100 + invoice.date + true +]]> + + + + + SequenceFlow_51 + sequenceFlow_aH3q9g + + + + + + + + + + + @@ -5051,9 +5062,9 @@ Betrag: _amount (Brutto € _amount_brutto - + - + @@ -5063,9 +5074,9 @@ Betrag: _amount (Brutto € _amount_brutto - + - + @@ -5126,21 +5137,9 @@ Betrag: _amount (Brutto € _amount_brutto - + - - - - - - - - - - - - - + @@ -5210,7 +5209,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -5219,15 +5218,15 @@ Betrag: _amount (Brutto € _amount_brutto - + - + - + - + @@ -5297,7 +5296,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -5309,18 +5308,18 @@ Betrag: _amount (Brutto € _amount_brutto - + - + - + - + - + @@ -5354,9 +5353,9 @@ Betrag: _amount (Brutto € _amount_brutto - + - + @@ -5450,7 +5449,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -5570,8 +5569,8 @@ Betrag: _amount (Brutto € _amount_brutto - - + + @@ -5588,7 +5587,7 @@ Betrag: _amount (Brutto € _amount_brutto - + @@ -5628,10 +5627,10 @@ Betrag: _amount (Brutto € _amount_brutto - + - - + + @@ -5644,21 +5643,9 @@ Betrag: _amount (Brutto € _amount_brutto - - - + - - - - - - - - - - @@ -5741,9 +5728,10 @@ Betrag: _amount (Brutto € _amount_brutto - - - + + + + @@ -5761,8 +5749,8 @@ Betrag: _amount (Brutto € _amount_brutto - - + + @@ -5845,8 +5833,8 @@ Betrag: _amount (Brutto € _amount_brutto - - + + @@ -5871,30 +5859,26 @@ Betrag: _amount (Brutto € _amount_brutto + - - - + - - - - + + - - - + + + + - - - - + + @@ -5952,13 +5936,13 @@ Betrag: _amount (Brutto € _amount_brutto - - - + + + - + @@ -6248,6 +6232,25 @@ Betrag: _amount (Brutto € _amount_brutto + + + + + + + + + + + + + + + + + + +