bug fix
This commit is contained in:
parent
5c7cdde0fe
commit
001787e018
1 changed files with 13 additions and 1 deletions
|
|
@ -257,6 +257,9 @@ public class OPListExportAdapter extends POIFindReplaceAdapter {
|
|||
for (ItemCollection invoice : invoices) {
|
||||
String currency = invoice.getItemValueString("invoice.currency");
|
||||
Double saldo = currencyCatSum.get(currency);
|
||||
if (saldo == null) {
|
||||
saldo = 0.0;
|
||||
}
|
||||
saldo = InvoiceUtil.round(saldo + invoice.getItemValueDouble("invoice.saldo"));
|
||||
currencyCatSum.put(currency, saldo);
|
||||
}
|
||||
|
|
@ -264,6 +267,9 @@ public class OPListExportAdapter extends POIFindReplaceAdapter {
|
|||
for (String cur : currencyList) {
|
||||
i++;
|
||||
Double catSum = currencyCatSum.get(cur);
|
||||
if (catSum == null) {
|
||||
catSum = 0.0;
|
||||
}
|
||||
categoryRow.getCell(4 + i).setCellValue(catSum);
|
||||
}
|
||||
|
||||
|
|
@ -272,7 +278,7 @@ public class OPListExportAdapter extends POIFindReplaceAdapter {
|
|||
// Init Saldo Map
|
||||
Map<String, Double> currencySum = new HashMap();
|
||||
for (String cur : currencyList) {
|
||||
Double saldo = Double.valueOf(0);
|
||||
double saldo = Double.valueOf(0);
|
||||
currencySum.put(cur, saldo);
|
||||
}
|
||||
|
||||
|
|
@ -297,6 +303,9 @@ public class OPListExportAdapter extends POIFindReplaceAdapter {
|
|||
// calculate summary
|
||||
String currency = invoice.getItemValueString("invoice.currency");
|
||||
Double saldo = currencySum.get(currency);
|
||||
if (saldo == null) {
|
||||
saldo = 0.0;
|
||||
}
|
||||
saldo = InvoiceUtil.round(saldo + total);
|
||||
currencySum.put(currency, saldo);
|
||||
|
||||
|
|
@ -306,6 +315,9 @@ public class OPListExportAdapter extends POIFindReplaceAdapter {
|
|||
|
||||
// Gesamtsumme berechnen
|
||||
Double totalSaldo = currencyTotalSum.get(currency);
|
||||
if (totalSaldo == null) {
|
||||
totalSaldo = 0.0;
|
||||
}
|
||||
totalSaldo = InvoiceUtil.round(totalSaldo + total);
|
||||
currencyTotalSum.put(currency, totalSaldo);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue