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

fixed 3rd currency case

Browse source
This commit is contained in:
Ralph Soika 2025-06-23 14:19:51 +02:00
parent 93c902ab4a
commit bd20c5cb5e
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -263,8 +263,13 @@ public class OPListExportAdapter extends POIFindReplaceAdapter {
for (ItemCollection invoice : invoices) {
String currency = invoice.getItemValueString("invoice.currency");
Double saldo = currencyCatSum.get(currency);
saldo = InvoiceUtil.round(saldo + invoice.getItemValueDouble("invoice.saldo"));
currencyCatSum.put(currency, saldo);
if (saldo == null) {
logger.warning(
"Failed to resolve currency '" + currency + "' for invoice " + invoice.getUniqueID());
} else {
saldo = InvoiceUtil.round(saldo + invoice.getItemValueDouble("invoice.saldo"));
currencyCatSum.put(currency, saldo);
}
}
int i = 0;
for (String cur : currencyList) {
@ -303,8 +308,13 @@ public class OPListExportAdapter extends POIFindReplaceAdapter {
// calculate summary
String currency = invoice.getItemValueString("invoice.currency");
Double saldo = currencySum.get(currency);
saldo = InvoiceUtil.round(saldo + total);
currencySum.put(currency, saldo);
if (saldo == null) {
logger.warning(
"Failed to resolve currency '" + currency + "' for invoice " + invoice.getUniqueID());
} else {
saldo = InvoiceUtil.round(saldo + total);
currencySum.put(currency, saldo);
}
// Saldo in richtige Spalte setzen...
int currencyColIndex = currencyList.indexOf(currency);
@ -312,8 +322,14 @@ public class OPListExportAdapter extends POIFindReplaceAdapter {
// Gesamtsumme berechnen
Double totalSaldo = currencyTotalSum.get(currency);
totalSaldo = InvoiceUtil.round(totalSaldo + total);
currencyTotalSum.put(currency, totalSaldo);
if (totalSaldo == null) {
logger.warning(
"Failed to resolve totalSaldo for currency '" + currency + "' invoice "
+ invoice.getUniqueID());
} else {
totalSaldo = InvoiceUtil.round(totalSaldo + total);
currencyTotalSum.put(currency, totalSaldo);
}
row.getCell(5 + currencyList.size()).setCellValue(invoice.getItemValueString("$workflowstatus"));