From e4357251bba8ef206289b061fd045494b95212a1 Mon Sep 17 00:00:00 2001 From: gaby Date: Wed, 21 Sep 2022 16:04:18 +0200 Subject: [PATCH] update --- .../InvoiceOutgoingPlugin.java | 6 ++- workflow/datev-import-1.0.0.bpmn | 26 +++++-------- workflow/rechnungsausgang-de-1.0.0.bpmn | 37 ++++++++++++------- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceOutgoingPlugin.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceOutgoingPlugin.java index f3bef47..9ca5d8d 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceOutgoingPlugin.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceOutgoingPlugin.java @@ -28,8 +28,10 @@ public class InvoiceOutgoingPlugin extends AbstractPlugin { public ItemCollection run(ItemCollection workitem, ItemCollection event) throws PluginException { String dbtrNumber = workitem.getItemValueString("dbtr.number"); ItemCollection debitor = kreditorService.findDebitor(dbtrNumber); - // update mail - workitem.setItemValue("dbtr.mail", debitor.getItemValueString("cdtr.mail")); + if (debitor!=null) { + // update mail + workitem.setItemValue("dbtr.mail", debitor.getItemValueString("cdtr.mail")); + } return workitem; } diff --git a/workflow/datev-import-1.0.0.bpmn b/workflow/datev-import-1.0.0.bpmn index 7a54593..f8fc31f 100644 --- a/workflow/datev-import-1.0.0.bpmn +++ b/workflow/datev-import-1.0.0.bpmn @@ -1,6 +1,6 @@ - + @@ -192,14 +192,12 @@ result.isValid=true; - + - SEPA-Body]]> - - - + + - + - SEPA-Body]]> - - - + + @@ -516,14 +512,12 @@ if (workitem['$file.count'][0]!=1) { - + - SEPA-Body]]> - - - + + diff --git a/workflow/rechnungsausgang-de-1.0.0.bpmn b/workflow/rechnungsausgang-de-1.0.0.bpmn index 05ded8f..5142946 100644 --- a/workflow/rechnungsausgang-de-1.0.0.bpmn +++ b/workflow/rechnungsausgang-de-1.0.0.bpmn @@ -121,7 +121,6 @@ th { font-weight: bold;} IntermediateThrowEvent_9 Task_1 IntermediateCatchEvent_8 - IntermediateThrowEvent_5 Task_4 IntermediateCatchEvent_14 IntermediateThrowEvent_7 @@ -144,6 +143,7 @@ th { font-weight: bold;} IntermediateCatchEvent_10 IntermediateCatchEvent_9 ExclusiveGateway_6 + IntermediateThrowEvent_5 @@ -1749,6 +1749,7 @@ Betrag: invoice.total invoice.currency + SequenceFlow_22 @@ -1766,7 +1767,7 @@ Betrag: invoice.total invoice.currencySequenceFlow_35 SequenceFlow_36 - + Html-Header @@ -1803,13 +1804,17 @@ Betrag: invoice.total invoice.currency + + + + SequenceFlow_35 SequenceFlow_37 - + Html-Header @@ -1818,11 +1823,11 @@ Betrag: invoice.total invoice.currency -Rechnungsnummer -Datum -Fälligkeit -Rechnungsbetrag -Saldo +Invoice Number +Date +Due Date +Invoice Amount +Balance @@ -1846,6 +1851,10 @@ Betrag: invoice.total invoice.currency + + + + SequenceFlow_36 @@ -1971,9 +1980,9 @@ Betrag: invoice.total invoice.currency - + - + @@ -2201,13 +2210,13 @@ Betrag: invoice.total invoice.currency - + - + @@ -2409,8 +2418,8 @@ Betrag: invoice.total invoice.currency - - + +