From f9ae321ec4c95222690b97e8ff1f5fb1b50cc2cf Mon Sep 17 00:00:00 2001 From: Sebastian Sieber Date: Fri, 20 Nov 2020 22:15:50 +0100 Subject: [PATCH 1/2] Use categoryCode of current allowanceCharge if exists --- .../org/mustangproject/ZUGFeRD/TransactionCalculator.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/TransactionCalculator.java b/library/src/main/java/org/mustangproject/ZUGFeRD/TransactionCalculator.java index f293b23d..bdb6f6e8 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/TransactionCalculator.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/TransactionCalculator.java @@ -162,7 +162,8 @@ public class TransactionCalculator implements IAbsoluteValueProvider { for (IZUGFeRDAllowanceCharge currentCharge : charges) { VATAmount theAmount = hm.get(currentCharge.getTaxPercent().stripTrailingZeros()); if (theAmount == null) { - theAmount = new VATAmount(BigDecimal.ZERO, BigDecimal.ZERO, "S"); + theAmount = new VATAmount(BigDecimal.ZERO, BigDecimal.ZERO, + currentCharge.getCategoryCode()!=null?currentCharge.getCategoryCode():"S"); } theAmount.setBasis(theAmount.getBasis().add(currentCharge.getTotalAmount(this))); BigDecimal factor = currentCharge.getTaxPercent().divide(new BigDecimal(100)); @@ -175,7 +176,8 @@ public class TransactionCalculator implements IAbsoluteValueProvider { for (IZUGFeRDAllowanceCharge currentAllowance : allowances) { VATAmount theAmount = hm.get(currentAllowance.getTaxPercent().stripTrailingZeros()); if (theAmount == null) { - theAmount = new VATAmount(BigDecimal.ZERO, BigDecimal.ZERO, "S"); + theAmount = new VATAmount(BigDecimal.ZERO, BigDecimal.ZERO, + currentAllowance.getCategoryCode()!=null?currentAllowance.getCategoryCode():"S"); } theAmount.setBasis(theAmount.getBasis().subtract(currentAllowance.getTotalAmount(this))); BigDecimal factor = currentAllowance.getTaxPercent().divide(new BigDecimal(100)); From 565c0c0a50947679e2a9c6833a6f6efecd3a389e Mon Sep 17 00:00:00 2001 From: Jochen Staerk Date: Mon, 23 Nov 2020 14:19:02 +0100 Subject: [PATCH 2/2] Update History.md --- History.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.md b/History.md index 020198b9..bff6e854 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,7 @@ +2.0.2 +===== +- #197 file attachments +- Charges/Allowances CategoryCode improvement PR #198 Thanks to weclapp-dev 2.0.1 =====