From 686ae2357de1973973959a1b86950735100aea5d Mon Sep 17 00:00:00 2001 From: gaby Date: Wed, 24 Feb 2021 16:24:37 +0100 Subject: [PATCH] update --- .../forms/alexander/form_basic.xhtml | 12 - .../forms/alexander/sub_exchange_rate.xhtml | 24 + .../alexander/sub_exchange_rate_read.xhtml | 20 + .../forms/alexander/sub_positionen.xhtml | 14 - .../forms/alexander/sub_positionen_read.xhtml | 10 - workflow/gutschriftabgleich-de-1.0.0.bpmn | 2356 +++++++++++++++++ workflow/rechnungseingang-de-1.0.6.bpmn | 1008 ++++--- 7 files changed, 2883 insertions(+), 561 deletions(-) create mode 100644 office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_exchange_rate.xhtml create mode 100644 office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_exchange_rate_read.xhtml create mode 100644 workflow/gutschriftabgleich-de-1.0.0.bpmn 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 f7f6775..b80a66b 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 @@ -22,7 +22,6 @@ -
Zahlungsart
@@ -37,17 +36,6 @@
-
-
Keine Buchung in Cargosoft
-
- -
-
-
- - - - diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_exchange_rate.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_exchange_rate.xhtml new file mode 100644 index 0000000..862f01b --- /dev/null +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_exchange_rate.xhtml @@ -0,0 +1,24 @@ + + + +
+
+
+ Exchange Rate:* +
+
+ + + +
+
+
+ + + \ No newline at end of file diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_exchange_rate_read.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_exchange_rate_read.xhtml new file mode 100644 index 0000000..c6996fa --- /dev/null +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_exchange_rate_read.xhtml @@ -0,0 +1,20 @@ + + + +
+
+ Exchange Rate:* +
+
+ + +
+
+ + \ No newline at end of file diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen.xhtml index e30a8bc..1159ac5 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen.xhtml @@ -6,20 +6,6 @@ xmlns:a="http://xmlns.jcp.org/jsf/passthrough"> -
-
-
- Exchange Rate:* -
-
- - - -
-
-
- diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen_read.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen_read.xhtml index a985eb7..da74000 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen_read.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen_read.xhtml @@ -5,16 +5,6 @@ xmlns:h="http://xmlns.jcp.org/jsf/html"> -
-
- Exchange Rate:* -
-
- - -
-
diff --git a/workflow/gutschriftabgleich-de-1.0.0.bpmn b/workflow/gutschriftabgleich-de-1.0.0.bpmn new file mode 100644 index 0000000..85cbfc7 --- /dev/null +++ b/workflow/gutschriftabgleich-de-1.0.0.bpmn @@ -0,0 +1,2356 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Task_2 + ExclusiveGateway_1 + StartEvent_1 + IntermediateCatchEvent_3 + IntermediateCatchEvent_13 + IntermediateCatchEvent_6 + EndEvent_1 + IntermediateCatchEvent_12 + EndEvent_3 + Task_4 + IntermediateCatchEvent_7 + Task_8 + IntermediateCatchEvent_25 + IntermediateCatchEvent_24 + IntermediateCatchEvent_5000-20 + IntermediateCatchEvent_19 + ExclusiveGateway_4 + IntermediateThrowEvent_3 + EventBasedGateway_1 + + + ExclusiveGateway_6 + IntermediateCatchEvent_5005-20 + IntermediateCatchEvent_21 + IntermediateThrowEvent_2 + Task_5005 + IntermediateCatchEvent_5005-10 + Task_5000 + IntermediateCatchEvent_5000-10 + IntermediateCatchEvent_18 + Task_5 + IntermediateCatchEvent_23 + EndEvent_2 + IntermediateCatchEvent_5005-30 + EventBasedGateway_2 + + + IntermediateCatchEvent_9 + IntermediateThrowEvent_5 + IntermediateCatchEvent_10 + IntermediateCatchEvent_1 + Task_1 + IntermediateCatchEvent_11 + + + + + + + + + txtlastcomment]]> + + + + + + + + + numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_31 + SequenceFlow_4 + SequenceFlow_5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_31 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + space.name]]> + + + false + + + + + + + SequenceFlow_46 + SequenceFlow_24 + + + SequenceFlow_0 + SequenceFlow_15 + SequenceFlow_21 + SequenceFlow_33 + + + + SequenceFlow_0 + + + + + + + + + txtlastcomment]]> + + + + + + + + + numsequencenumber: 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 + + + cargosoft-export-1.0 + 1000 + 100 + (?!txtworkflowhistory)(^[a-zA-Z]|^_) + +]]> + + + + + + + + + + + + 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]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_10 + SequenceFlow_41 + + + SequenceFlow_37 + SequenceFlow_8 + SequenceFlow_10 + SequenceFlow_54 + + + + + + + + + + txtlastcomment]]> + + + + + + + + + cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_33 + SequenceFlow_20 + SequenceFlow_22 + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + + SequenceFlow_20 + + + + + + + + + txtlastcomment]]> + + + + + + + + + numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_44 + SequenceFlow_52 + SequenceFlow_47 + + + SequenceFlow_47 + + + + + SequenceFlow_24 + SequenceFlow_13 + SequenceFlow_16 + + + workitem['space.team'] && workitem['space.team'][0]!="" + + + !workitem['space.team'] || workitem['space.team'][0]=="" + + + SequenceFlow_51 + SequenceFlow_16 + SequenceFlow_4 + + + SequenceFlow_15 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_21 + + + + + + + + + + + txtlastcomment]]> + + + + + + + + + numsequencenumber: 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]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_36 + SequenceFlow_35 + + + SequenceFlow_35 + + + + + + SequenceFlow_39 + + + + + + + + + txtlastcomment]]> + + + + + + + + + numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_39 + SequenceFlow_59 + SequenceFlow_40 + + + SequenceFlow_40 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + space.name]]> + + + false + + + + SequenceFlow_11 + + + + + + + + + + + + _subject]]> + + + + + + + + + _amount (Brutto € _amount_brutto) +_description]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home]]> + + + + + + + + + + + + false + + + SequenceFlow_5 + SequenceFlow_44 + + + + + + + + + cdtr.name invoice.number]]> + + + + + + + + + cdtr.name +Rechnungsnummer: invoice.number +Betrag: invoice.total invoice.currency + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false]]> + + + + + + + + + + + + false + + + + + + + + + + SequenceFlow_54 + SequenceFlow_56 + + + + + SequenceFlow_56 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + txtlastcomment]]> + + + + + + + + + numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_17 + SequenceFlow_60 + SequenceFlow_9 + + + SequenceFlow_9 + + + + SequenceFlow_17 + + + + + SequenceFlow_22 + SequenceFlow_46 + SequenceFlow_49 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home +false +Wollen Sie den Vorgang wirklich löschen?]]> + + + + + + + + + + + + false + + + + + + + SequenceFlow_49 + SequenceFlow_48 + + + SequenceFlow_48 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_52 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_60 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + false + + + + SequenceFlow_59 + + + + + + + + Datenübergabe an Cargosoft. + +Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' + + + + + Liegt eine Logistik Leistung vor, wird ein Fachbereich ausgewählt + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/workflow/rechnungseingang-de-1.0.6.bpmn b/workflow/rechnungseingang-de-1.0.6.bpmn index 8ebb719..599db2b 100644 --- a/workflow/rechnungseingang-de-1.0.6.bpmn +++ b/workflow/rechnungseingang-de-1.0.6.bpmn @@ -49,77 +49,77 @@ - ExclusiveGateway_4 Task_2 ExclusiveGateway_1 StartEvent_1 IntermediateCatchEvent_3 IntermediateCatchEvent_13 - IntermediateCatchEvent_5000-20 IntermediateCatchEvent_6 EventBasedGateway_1 + IntermediateCatchEvent_5000-20 + ExclusiveGateway_4 IntermediateCatchEvent_19 IntermediateThrowEvent_3 + IntermediateCatchEvent_27 + Task_10 + EndEvent_5 IntermediateCatchEvent_2 ExclusiveGateway_6 IntermediateCatchEvent_5005-20 - EventBasedGateway_2 + IntermediateCatchEvent_21 + IntermediateThrowEvent_2 Task_5005 IntermediateCatchEvent_5005-10 IntermediateCatchEvent_5005-30 - IntermediateCatchEvent_21 + EventBasedGateway_2 ExclusiveGateway_3 - ExclusiveGateway_5 - IntermediateCatchEvent_28 - IntermediateCatchEvent_26 - ExclusiveGateway_7 - IntermediateCatchEvent_5 - IntermediateCatchEvent_20 - Task_7 Task_5000 - IntermediateCatchEvent_7 - EndEvent_1 - EndEvent_2 - IntermediateCatchEvent_16 - IntermediateCatchEvent_22 - Task_6 - IntermediateCatchEvent_23 IntermediateCatchEvent_5000-10 - IntermediateCatchEvent_4 - IntermediateCatchEvent_12 EventBasedGateway_4 - Task_5 - ExclusiveGateway_2 - IntermediateCatchEvent_8 - Task_4 - IntermediateCatchEvent_17 + IntermediateCatchEvent_16 IntermediateCatchEvent_15 - IntermediateCatchEvent_14 - IntermediateCatchEvent_24 - EndEvent_3 - IntermediateCatchEvent_18 - IntermediateCatchEvent_25 - Task_3 - Task_8 Task_9 + Task_3 + EndEvent_3 + IntermediateCatchEvent_24 + IntermediateCatchEvent_12 + Task_8 + EndEvent_1 + IntermediateCatchEvent_25 + Task_4 + IntermediateCatchEvent_7 + IntermediateCatchEvent_4 + Task_5 + Task_6 + IntermediateCatchEvent_14 + IntermediateCatchEvent_8 + Task_7 + IntermediateCatchEvent_22 + IntermediateCatchEvent_18 + ExclusiveGateway_2 + IntermediateCatchEvent_20 + IntermediateCatchEvent_17 + EndEvent_2 + IntermediateCatchEvent_5 + IntermediateCatchEvent_23 IntermediateCatchEvent_9 - Task_1 - IntermediateCatchEvent_11 IntermediateThrowEvent_5 IntermediateCatchEvent_10 IntermediateCatchEvent_1 + IntermediateCatchEvent_11 + Task_1 - + txtlastcomment]]> @@ -312,7 +312,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + txtlastcomment]]> @@ -402,7 +402,15 @@ Betrag: _amount (Brutto € _amount_brutto home -space.name]]> +space.name + + + cargosoft-export-1.0 + 1000 + 100 + (?!txtworkflowhistory)(^[a-zA-Z]|^_) + +]]> @@ -411,7 +419,7 @@ Betrag: _amount (Brutto € _amount_brutto - + false @@ -433,6 +441,7 @@ var b= workitem.get("order.total")[0]; SequenceFlow_8 SequenceFlow_51 + @@ -735,7 +744,7 @@ result.isValid=true; - + txtlastcomment]]> @@ -766,8 +775,8 @@ result.isValid=true; $workflowgroup - $workflowstatus]]> - SequenceFlow_4 SequenceFlow_58 + SequenceFlow_67 SequenceFlow_55 SequenceFlow_50 @@ -855,7 +864,7 @@ result.isValid=true; SequenceFlow_29 SequenceFlow_30 - + @@ -924,7 +933,7 @@ Betrag: _amount (Brutto € _amount_brutto SequenceFlow_30 - SequenceFlow_7 + SequenceFlow_67 @@ -932,7 +941,7 @@ Betrag: _amount (Brutto € _amount_brutto - + txtlastcomment]]> @@ -966,6 +975,7 @@ Betrag: _amount (Brutto € _amount_bruttoSequenceFlow_25 SequenceFlow_44 SequenceFlow_52 + SequenceFlow_68 SequenceFlow_47 @@ -1045,7 +1055,6 @@ Betrag: _amount (Brutto € _amount_bruttoSequenceFlow_12 - SequenceFlow_24 SequenceFlow_13 @@ -1057,21 +1066,12 @@ Betrag: _amount (Brutto € _amount_brutto !workitem['space.team'] || workitem['space.team'][0]=="" - - SequenceFlow_62 - SequenceFlow_64 + + SequenceFlow_18 SequenceFlow_1 - SequenceFlow_5 + SequenceFlow_68 - - SequenceFlow_7 - SequenceFlow_5 - SequenceFlow_4 - - - workitem['payment.type'] && (workitem['payment.type'][0]=="direct_debit" || workitem['payment.type'][0]=="credit") - @@ -1130,7 +1130,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - invoice.no_cargosoft_export]]> + false @@ -1153,7 +1153,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + @@ -1180,8 +1180,8 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - - workitem['payment.type'] && (workitem['payment.type'][0]=="direct_debit" || workitem['payment.type'][0].startWith("credit")) + + workitem['payment.type'][0]=="direct_debit" @@ -1879,7 +1879,6 @@ Betrag: _amount (Brutto € _amount_brutto - @@ -2135,6 +2134,7 @@ result.isValid=true; SequenceFlow_22 SequenceFlow_46 SequenceFlow_49 + SequenceFlow_65 @@ -2227,7 +2227,7 @@ result.isValid=true; - + txtlastcomment]]> @@ -2236,7 +2236,7 @@ result.isValid=true; - + numsequencenumber: cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> @@ -2621,86 +2621,7 @@ Betrag: _amount (Brutto € _amount_brutto - - SequenceFlow_18 - SequenceFlow_61 - SequenceFlow_63 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - SequenceFlow_61 - SequenceFlow_62 - - - workitem['invoice.no_cargosoft_export'][0]==true - - - + @@ -2709,7 +2630,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - _subject]]> + @@ -2718,16 +2639,13 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - _amount (Brutto € _amount_brutto) -_description]]> + - + @@ -2737,40 +2655,38 @@ Betrag: _amount (Brutto € _amount_brutto - + - + - + - home -space.name - + false - cargosoft-export-1.0 - 1000 - 100 - (?!txtworkflowhistory)(^[a-zA-Z]|^_) - -]]> + gutschriftabgleich-de-1.0 + 5000 + 980 + $file,_childitems,(^request.|^ml.) + /pages/workitems/workitem.jsf?id=$uniqueid + ]]> - + - + false @@ -2779,14 +2695,60 @@ Betrag: _amount (Brutto € _amount_brutto - - SequenceFlow_63 - SequenceFlow_64 - - + + SequenceFlow_65 + SequenceFlow_69 + - - + + + + workitem['payment.type'][0]=="credit" + + + + + + + + txtlastcomment]]> + + + + + + + + + cdtr.name invoice.number (invoice.currency invoice.total) space.name]]> + + + true + + + + + + + + + + + + + + + + + $workflowgroup - $workflowstatus]]> + SequenceFlow_69 + SequenceFlow_70 + + + + SequenceFlow_70 + + Es handelt sich um einen SEPA Lauf. Die Rechnung muss explizit freigegeben werden. @@ -2802,39 +2764,43 @@ Betrag: _amount (Brutto € _amount_brutto - + + + Liegt eine Logistik Leistung vor, wird ein Fachbereich ausgewählt + + - + - + - + - + - + - + - + - + - + - + @@ -2844,45 +2810,45 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2890,7 +2856,7 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' - + @@ -2918,67 +2884,65 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - + + + + - + - + - + @@ -2988,25 +2952,25 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' - + - + - + - + - + - + - + @@ -3016,135 +2980,135 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + @@ -3152,69 +3116,75 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + + @@ -3224,21 +3194,21 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' - - - + + + - - - + + + - - - + + + @@ -3248,15 +3218,15 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' - - - + + + - - - + + + @@ -3272,84 +3242,69 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - + + + - + - - - + + + - + - - - + + + - - - - - - - - - + - - - + + + @@ -3358,55 +3313,55 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' - - - - + + + + - - - + + + - - - + + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -3416,152 +3371,142 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' - - - + + + - - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + @@ -3571,90 +3516,103 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - + + + + +