louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prevent two exceptions

Browse Source
This commit is contained in:
Jochen Stärk
2026-02-26 13:50:05 +01:00
parent 720fbd34d4
commit fb0634f279
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/src/main/java/org/mustangproject/Item.java
View File

@@ -231,13 +231,13 @@ public class Item implements IZUGFeRDExportableItem {
izac = new Charge(); izac = new Charge();
} }
if (amountString != null) { if (amountString != null) {
izac.setTotalAmount(new BigDecimal(amountString)); izac.setTotalAmount(new BigDecimal(amountString.trim()));
} }
if (basisAmountString != null) { if (basisAmountString != null) {
izac.setBasisAmount(new BigDecimal(basisAmountString)); izac.setBasisAmount(new BigDecimal(basisAmountString.trim()));
} }
if (percentString != null) { if (percentString != null) {
izac.setPercent(new BigDecimal(percentString)); izac.setPercent(new BigDecimal(percentString.trim()));
} }
if (reason != null) { if (reason != null) {
izac.setReason(reason); izac.setReason(reason);

3
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
View File

@@ -1260,7 +1260,8 @@ public class ZUGFeRDInvoiceImporter {
if (chargeChildName != null) { if (chargeChildName != null) {
if (chargeChildName.equals("BasisPeriodMeasure")) { if (chargeChildName.equals("BasisPeriodMeasure")) {
if (currentNode.getAttributes().getNamedItem("unitCode").getNodeValue().equals("DAY")) { if (currentNode.getAttributes().getNamedItem("unitCode").getNodeValue().equals("DAY")) {
cd.setDays(Integer.valueOf(XMLTools.trimOrNull(currentNode))); cd.setDays(Math.round(Float.valueOf(XMLTools.trimOrNull(currentNode))));
// in case someone writes 30.00 days (happens!) we still want 30 integer days
} }
} else if (chargeChildName.equals("CalculationPercent")) { } else if (chargeChildName.equals("CalculationPercent")) {
cd.setPercent(new BigDecimal(XMLTools.trimOrNull(currentNode))); cd.setPercent(new BigDecimal(XMLTools.trimOrNull(currentNode)));