From da9f4c7c0ec7e509af2f8a25663b7b91e7120d9b Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Mon, 31 Oct 2022 08:45:24 +0100 Subject: [PATCH] =?UTF-8?q?=C3=BCbersetzung=20Mahnstatus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mahnlauf/MahnlaufExecuteAdapter.java | 7 ++++++ workflow/mahnlauf-de-1.0.0.bpmn | 2 +- workflow/rechnungsausgang-de-1.0.0.bpmn | 24 +++++++++++-------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufExecuteAdapter.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufExecuteAdapter.java index 39b1a64..c543d12 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufExecuteAdapter.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/MahnlaufExecuteAdapter.java @@ -104,6 +104,13 @@ public class MahnlaufExecuteAdapter implements SignalAdapter { invoiceStub.setItemValue("invoice.date", invoice.getItemValue("invoice.date")); invoiceStub.setItemValue("invoice.duedate", invoice.getItemValue("invoice.duedate")); invoiceStub.setItemValue("$workflowstatus", invoice.getItemValue("$workflowstatus")); + // test if we have a international status translation.. + if (!invoice.getItemValueString("workflowstatus_en").isEmpty()) { + invoiceStub.setItemValue("workflowstatus_en", invoice.getItemValue("workflowstatus_en")); + } else { + // default + invoiceStub.setItemValue("workflowstatus_en", invoice.getItemValue("$workflowstatus")); + } invoiceList.add(invoiceStub.getAllItems()); // store currency in mahnlauf diff --git a/workflow/mahnlauf-de-1.0.0.bpmn b/workflow/mahnlauf-de-1.0.0.bpmn index 168210c..29c54f8 100644 --- a/workflow/mahnlauf-de-1.0.0.bpmn +++ b/workflow/mahnlauf-de-1.0.0.bpmn @@ -489,7 +489,7 @@ Debitor: dbtr.name (dbtr.number) invoice.duedate invoice.total invoice.currency invoice.saldo invoice.currency - $workflowstatus + workflowstatus_en diff --git a/workflow/rechnungsausgang-de-1.0.0.bpmn b/workflow/rechnungsausgang-de-1.0.0.bpmn index 34c4489..cedc4b5 100644 --- a/workflow/rechnungsausgang-de-1.0.0.bpmn +++ b/workflow/rechnungsausgang-de-1.0.0.bpmn @@ -1402,6 +1402,7 @@ Betrag: invoice.total invoice.currency 5 +1. Dunning ]]> @@ -1479,7 +1480,8 @@ Betrag: invoice.total invoice.currency - 5]]> + 5 +2. Dunning]]> @@ -1796,7 +1798,9 @@ Betrag: invoice.total invoice.currency - 7]]> + 7 +Reminder +]]> @@ -2617,9 +2621,9 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht - + - + @@ -2959,15 +2963,15 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht - - - + + + - - - + + +