diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java index 9f96edb..7339520 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java @@ -103,7 +103,8 @@ public class OPListController implements Serializable { if (_dbtrNumber.startsWith("D")) { _dbtrNumber = _dbtrNumber.substring(1); } - String query = "(type:workitem OR type:workitemarchive) AND ($modelversion:rechnungsausgang-*) AND (dbtr.number:" + //(type:workitem OR type:workitemarchive) + String query = "(type:workitem) AND ($modelversion:rechnungsausgang-*) AND (dbtr.number:" + _dbtrNumber + ")"; try { diff --git a/pom.xml b/pom.xml index d68e7e1..4e6d699 100644 --- a/pom.xml +++ b/pom.xml @@ -25,9 +25,9 @@ yyyyMMddHHmmss - 5.2.15 - 4.2.2 - 4.5.3-SNAPSHOT + 5.2.16 + 4.2.3 + 4.5.3 2.3.1-SNAPSHOT 2.2.14-SNAPSHOT 1.0.20 diff --git a/workflow/rechnungsausgang-de-1.0.0.bpmn b/workflow/rechnungsausgang-de-1.0.0.bpmn index 5142946..99fe631 100644 --- a/workflow/rechnungsausgang-de-1.0.0.bpmn +++ b/workflow/rechnungsausgang-de-1.0.0.bpmn @@ -1,6 +1,6 @@ - + @@ -104,7 +104,6 @@ th { font-weight: bold;} IntermediateCatchEvent_17 IntermediateCatchEvent_2 IntermediateCatchEvent_3 - IntermediateCatchEvent_18 ExclusiveGateway_5 EventBasedGateway_1 IntermediateThrowEvent_8 @@ -112,6 +111,7 @@ th { font-weight: bold;} EventBasedGateway_2 IntermediateCatchEvent_5000-20 IntermediateCatchEvent_1 + IntermediateCatchEvent_18 EndEvent_3 @@ -489,7 +489,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + txtlastcomment]]> @@ -1520,7 +1520,7 @@ Betrag: invoice.total invoice.currency - + @@ -1595,6 +1595,9 @@ Betrag: invoice.total invoice.currency invoice.saldo]]> + + + SequenceFlow_10 SequenceFlow_11 @@ -1608,6 +1611,9 @@ Betrag: invoice.total invoice.currency invoice.saldo]]> + + + SequenceFlow_12 SequenceFlow_14 @@ -1751,6 +1757,9 @@ Betrag: invoice.total invoice.currency + + + SequenceFlow_22 @@ -1876,6 +1885,7 @@ Betrag: invoice.total invoice.currencyTrigger über ZahlungseingangsSaldoAdapter + @@ -2017,7 +2027,7 @@ Betrag: invoice.total invoice.currency - + @@ -2094,9 +2104,9 @@ Betrag: invoice.total invoice.currency - + - + @@ -2113,65 +2123,65 @@ Betrag: invoice.total invoice.currency - + - + - + - + - + - + - + - + - + - + - + - + @@ -2189,7 +2199,7 @@ Betrag: invoice.total invoice.currency - + @@ -2201,27 +2211,27 @@ Betrag: invoice.total invoice.currency - + - + - + - + - + @@ -2393,8 +2403,8 @@ Betrag: invoice.total invoice.currency - - + + @@ -2480,9 +2490,9 @@ Betrag: invoice.total invoice.currency - - - + + + @@ -2572,6 +2582,13 @@ Betrag: invoice.total invoice.currency + + + + + + +