Compare commits
1 commit
master
...
office-ale
| Author | SHA1 | Date | |
|---|---|---|---|
| bd20c5cb5e |
1 changed files with 22 additions and 6 deletions
|
|
@ -263,8 +263,13 @@ 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);
|
||||||
saldo = InvoiceUtil.round(saldo + invoice.getItemValueDouble("invoice.saldo"));
|
if (saldo == null) {
|
||||||
currencyCatSum.put(currency, saldo);
|
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;
|
int i = 0;
|
||||||
for (String cur : currencyList) {
|
for (String cur : currencyList) {
|
||||||
|
|
@ -303,8 +308,13 @@ 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);
|
||||||
saldo = InvoiceUtil.round(saldo + total);
|
if (saldo == null) {
|
||||||
currencySum.put(currency, saldo);
|
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...
|
// Saldo in richtige Spalte setzen...
|
||||||
int currencyColIndex = currencyList.indexOf(currency);
|
int currencyColIndex = currencyList.indexOf(currency);
|
||||||
|
|
@ -312,8 +322,14 @@ public class OPListExportAdapter extends POIFindReplaceAdapter {
|
||||||
|
|
||||||
// Gesamtsumme berechnen
|
// Gesamtsumme berechnen
|
||||||
Double totalSaldo = currencyTotalSum.get(currency);
|
Double totalSaldo = currencyTotalSum.get(currency);
|
||||||
totalSaldo = InvoiceUtil.round(totalSaldo + total);
|
if (totalSaldo == null) {
|
||||||
currencyTotalSum.put(currency, totalSaldo);
|
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"));
|
row.getCell(5 + currencyList.size()).setCellValue(invoice.getItemValueString("$workflowstatus"));
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue