From e3a24515f6abd1eb305865dc1441a23e51e4dfa2 Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Wed, 12 Jun 2024 11:29:52 +0200 Subject: [PATCH] fix missing invoice.rate --- .../java/com/alexanderlogistics/OPListController.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 758c94c..e33a529 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 @@ -137,6 +137,15 @@ public class OPListController implements Serializable { // passen invoiceList = new ArrayList(); for (ItemCollection _invoice : invoiceListTemp) { + + // Test if we have 'invoice.base.amount' and 'invoice.rate' + if (!_invoice.hasItem("invoice.base.amount")) { + _invoice.setItemValue("invoice.base.amount", 0.0); + } + if (!_invoice.hasItem("invoice.rate")) { + _invoice.setItemValue("invoice.rate", 0.0); + } + if (currencyFilter == null || currencyFilter.isEmpty() || currencyFilter.equals("-")) { invoiceList.add(_invoice); } else { @@ -162,6 +171,8 @@ public class OPListController implements Serializable { if (rate != 0) { maxSaldo = maxSaldo / rate; invoice.setItemValue("invoice.saldo.byrate", maxSaldo); + } else { + invoice.setItemValue("invoice.saldo.byrate", 0.0); } } }