Imixs/office-alexander-logistics
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug fix

Browse source
This commit is contained in:
Ralph Soika 2025-05-27 17:24:43 +02:00
parent 5c7cdde0fe
commit 001787e018
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java
View file

@ -257,6 +257,9 @@ public class OPListExportAdapter extends POIFindReplaceAdapter {
for (ItemCollection invoice : invoices) { for (ItemCollection invoice : invoices) {
String currency = invoice.getItemValueString("invoice.currency"); String currency = invoice.getItemValueString("invoice.currency");
Double saldo = currencyCatSum.get(currency); Double saldo = currencyCatSum.get(currency);
if (saldo == null) {
saldo = 0.0;
}
saldo = InvoiceUtil.round(saldo + invoice.getItemValueDouble("invoice.saldo")); saldo = InvoiceUtil.round(saldo + invoice.getItemValueDouble("invoice.saldo"));
currencyCatSum.put(currency, saldo); currencyCatSum.put(currency, saldo);
} }
@ -264,6 +267,9 @@ public class OPListExportAdapter extends POIFindReplaceAdapter {
for (String cur : currencyList) { for (String cur : currencyList) {
i++; i++;
Double catSum = currencyCatSum.get(cur); Double catSum = currencyCatSum.get(cur);
if (catSum == null) {
catSum = 0.0;
}
categoryRow.getCell(4 + i).setCellValue(catSum); categoryRow.getCell(4 + i).setCellValue(catSum);
} }
@ -272,7 +278,7 @@ public class OPListExportAdapter extends POIFindReplaceAdapter {
// Init Saldo Map // Init Saldo Map
Map<String, Double> currencySum = new HashMap(); Map<String, Double> currencySum = new HashMap();
for (String cur : currencyList) { for (String cur : currencyList) {
Double saldo = Double.valueOf(0); double saldo = Double.valueOf(0);
currencySum.put(cur, saldo); currencySum.put(cur, saldo);
} }
@ -297,6 +303,9 @@ public class OPListExportAdapter extends POIFindReplaceAdapter {
// calculate summary // calculate summary
String currency = invoice.getItemValueString("invoice.currency"); String currency = invoice.getItemValueString("invoice.currency");
Double saldo = currencySum.get(currency); Double saldo = currencySum.get(currency);
if (saldo == null) {
saldo = 0.0;
}
saldo = InvoiceUtil.round(saldo + total); saldo = InvoiceUtil.round(saldo + total);
currencySum.put(currency, saldo); currencySum.put(currency, saldo);
@ -306,6 +315,9 @@ public class OPListExportAdapter extends POIFindReplaceAdapter {
// Gesamtsumme berechnen // Gesamtsumme berechnen
Double totalSaldo = currencyTotalSum.get(currency); Double totalSaldo = currencyTotalSum.get(currency);
if (totalSaldo == null) {
totalSaldo = 0.0;
}
totalSaldo = InvoiceUtil.round(totalSaldo + total); totalSaldo = InvoiceUtil.round(totalSaldo + total);
currencyTotalSum.put(currency, totalSaldo); currencyTotalSum.put(currency, totalSaldo);