diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoicePlugin.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoicePlugin.java
index a6649de..7ad0600 100644
--- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoicePlugin.java
+++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoicePlugin.java
@@ -426,13 +426,13 @@ public class InvoicePlugin extends AbstractPlugin {
* This method returns true if the current workitem is a Cargosoft Invoice.
*
* This can be based on different model versions e.g. rechnungseingang-de-1.2,
- * rechnungseingang-pl-1.0, ...
+ * rechnungseingang-pl-1.0, rechnungseingang-dwc-1.0, ...
*
* @param workitem
* @return
*/
public static boolean isCargoRechnung(ItemCollection workitem) {
- String REGEX_PATTERN = "rechnungseingang-([a-z]{2})-\\d.\\d";
+ String REGEX_PATTERN = "rechnungseingang-([a-z]{2}|[a-z]{3})-\\d.\\d";
// Erstellen Sie ein Pattern-Objekt
Pattern pattern = Pattern.compile(REGEX_PATTERN);
Matcher matcher = pattern.matcher(workitem.getModelVersion());
diff --git a/reports/cargosoft/cargosoft-1.0.0-dwc.xsl b/reports/cargosoft/cargosoft-1.0.0-dwc.xsl
index 0af87d5..b3396be 100644
--- a/reports/cargosoft/cargosoft-1.0.0-dwc.xsl
+++ b/reports/cargosoft/cargosoft-1.0.0-dwc.xsl
@@ -11,7 +11,6 @@
-
@@ -19,8 +18,7 @@
Imixs-Office-Workflow
Cargosoft
-
+
@@ -45,7 +43,6 @@
-
@@ -61,8 +58,7 @@
überschneiden mit dem CargoSoft Belegnummernkreis.
Daher den Nummernkreis vorher mit CargoSoft absprechen. -->
-
+
@@ -103,8 +99,7 @@
-
+
@@ -120,17 +115,14 @@
-
+
+ test="string-length(item[@name='invoice.exchangerate']/value) >0">
+ select="item[@name='invoice.exchangerate']/value" />
@@ -140,30 +132,25 @@
false
-
+
false
-
+
-
-
+
-
+
@@ -177,8 +164,7 @@
select="./value/item[@name='md5checksum']/value" />
1
-
+
Imixs-Office-Workflow
@@ -213,8 +199,7 @@
-
+
@@ -222,8 +207,7 @@
-
+
@@ -232,8 +216,7 @@
-
+
diff --git a/workflow/dwc/rechnungseingang-dwc-1.0.1.bpmn b/workflow/dwc/rechnungseingang-dwc-1.0.1.bpmn
index 97c630a..3e47cf7 100644
--- a/workflow/dwc/rechnungseingang-dwc-1.0.1.bpmn
+++ b/workflow/dwc/rechnungseingang-dwc-1.0.1.bpmn
@@ -106,12 +106,14 @@
ExclusiveGateway_3
DataObject_1
TextAnnotation_1
- TextAnnotation_3
event_pAR6FQ
event_FPc1AA
+ Task_8
+ EndEvent_3
+ IntermediateCatchEvent_7
+ IntermediateCatchEvent_24
- EndEvent_3
Task_5000
IntermediateCatchEvent_5000-10
IntermediateCatchEvent_33
@@ -121,11 +123,8 @@
EventBasedGateway_4
Task_16
IntermediateCatchEvent_37
- IntermediateCatchEvent_24
- Task_8
IntermediateCatchEvent_16
Task_9
- IntermediateCatchEvent_7
ExclusiveGateway_2
IntermediateCatchEvent_29
IntermediateCatchEvent_39
@@ -164,6 +163,7 @@
DataObject_3
TextAnnotation_2
IntermediateCatchEvent_62
+ gateway_Al0gGg
@@ -1054,12 +1054,10 @@ if (workitem['payment.type'][0]!="direct_debit" && workitem['payment.type'][0]!
$workflowgroup - $workflowstatus]]>
- SequenceFlow_25
- SequenceFlow_44
SequenceFlow_52
- SequenceFlow_58
SequenceFlow_90
SequenceFlow_47
+ sequenceFlow_9rYDHA
SequenceFlow_47
@@ -1285,7 +1283,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com
-
+
workitem['payment.type'][0]=="direct_debit"
@@ -1659,7 +1657,7 @@ Betrag: _amount (Brutto € _amount_brutto
-
+
@@ -3329,7 +3327,7 @@ Betrag: _amount (Brutto € _amount_brutto
-
+
@@ -4769,10 +4767,10 @@ Betrag: _amount (Brutto € _amount_brutto
-
- Datenübergabe an Cargosoft.
+
+
+Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export']]>
@@ -4788,10 +4786,6 @@ Betrag: _amount (Brutto € _amount_brutto
-
- Buchhaltung setzt Flag, wenn Mahnung eingetroffen ist
-
-
@@ -4901,6 +4895,16 @@ Betrag: _amount (Brutto € _amount_brutto
+
+
+ SequenceFlow_25
+ sequenceFlow_9rYDHA
+ SequenceFlow_58
+ SequenceFlow_44
+
+
+
+
@@ -4914,10 +4918,10 @@ Betrag: _amount (Brutto € _amount_brutto
-
+
-
+
@@ -4926,15 +4930,15 @@ Betrag: _amount (Brutto € _amount_brutto
-
+
-
+
-
+
-
+
@@ -4944,15 +4948,15 @@ Betrag: _amount (Brutto € _amount_brutto
-
+
-
+
-
+
-
+
@@ -4962,9 +4966,9 @@ Betrag: _amount (Brutto € _amount_brutto
-
+
-
+
@@ -4989,51 +4993,51 @@ Betrag: _amount (Brutto € _amount_brutto
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5043,18 +5047,18 @@ Betrag: _amount (Brutto € _amount_brutto
-
+
-
+
-
+
-
+
-
+
@@ -5064,84 +5068,84 @@ Betrag: _amount (Brutto € _amount_brutto
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5163,63 +5167,63 @@ Betrag: _amount (Brutto € _amount_brutto
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5247,75 +5251,75 @@ Betrag: _amount (Brutto € _amount_brutto
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5337,24 +5341,21 @@ Betrag: _amount (Brutto € _amount_brutto
-
+
-
+
-
-
-
-
+
-
+
-
+
-
+
@@ -5370,9 +5371,9 @@ Betrag: _amount (Brutto € _amount_brutto
-
+
-
+
@@ -5388,30 +5389,30 @@ Betrag: _amount (Brutto € _amount_brutto
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5421,36 +5422,36 @@ Betrag: _amount (Brutto € _amount_brutto
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5463,15 +5464,15 @@ Betrag: _amount (Brutto € _amount_brutto
-
-
+
+
-
-
-
-
+
+
+
+
@@ -5480,13 +5481,13 @@ Betrag: _amount (Brutto € _amount_brutto
-
-
+
+
-
-
+
+
@@ -5497,84 +5498,74 @@ Betrag: _amount (Brutto € _amount_brutto
-
-
-
+
+
+
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
+
+
+
+
-
-
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
-
-
-
+
+
@@ -5585,82 +5576,76 @@ Betrag: _amount (Brutto € _amount_brutto
-
-
+
+
-
-
+
+
-
-
-
-
+
+
-
-
-
-
-
+
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
@@ -5683,107 +5668,92 @@ Betrag: _amount (Brutto € _amount_brutto
-
-
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
+
+
+
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
@@ -5832,98 +5802,90 @@ Betrag: _amount (Brutto € _amount_brutto
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
-
-
-
+
+
+
+
-
-
+
+
-
+
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
-
-
-
-
-
+
+
-
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
@@ -5943,20 +5905,21 @@ Betrag: _amount (Brutto € _amount_brutto
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
+
+
@@ -5971,9 +5934,9 @@ Betrag: _amount (Brutto € _amount_brutto
-
-
-
+
+
+
@@ -5987,9 +5950,9 @@ Betrag: _amount (Brutto € _amount_brutto
-
-
-
+
+
+
@@ -6000,27 +5963,27 @@ Betrag: _amount (Brutto € _amount_brutto
-
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
-
+
+
@@ -6029,82 +5992,84 @@ Betrag: _amount (Brutto € _amount_brutto
-
-
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
+
+
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/workflow/dwc/rechnungseingang-dwc-1.0.1.png b/workflow/dwc/rechnungseingang-dwc-1.0.1.png
new file mode 100644
index 0000000..2f61f02
Binary files /dev/null and b/workflow/dwc/rechnungseingang-dwc-1.0.1.png differ
diff --git a/workflow/dwc/rechnungseingang-dwc-1.0.1.svg b/workflow/dwc/rechnungseingang-dwc-1.0.1.svg
new file mode 100644
index 0000000..f2a044f
--- /dev/null
+++ b/workflow/dwc/rechnungseingang-dwc-1.0.1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file