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

Merge branch 'master' of github.com:ZUGFeRD/mustangproject

Browse Source 
# Conflicts:
#	History.md
This commit is contained in:
jstaerk
2020-11-24 10:12:27 +01:00
parent e5d055aac5 565c0c0a50
commit df43d2f878
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
History.md
View File

@@ -1,7 +1,7 @@
2.0.2 2.0.2
===== =======
- #197 file attachments
- #197 xml attachment errors - Charges/Allowances CategoryCode improvement PR #198 Thanks to weclapp-dev
2.0.1 2.0.1
===== =====

6
library/src/main/java/org/mustangproject/ZUGFeRD/TransactionCalculator.java
View File

@@ -162,7 +162,8 @@ public class TransactionCalculator implements IAbsoluteValueProvider {
for (IZUGFeRDAllowanceCharge currentCharge : charges) { for (IZUGFeRDAllowanceCharge currentCharge : charges) {
VATAmount theAmount = hm.get(currentCharge.getTaxPercent().stripTrailingZeros()); VATAmount theAmount = hm.get(currentCharge.getTaxPercent().stripTrailingZeros());
if (theAmount == null) { 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))); theAmount.setBasis(theAmount.getBasis().add(currentCharge.getTotalAmount(this)));
BigDecimal factor = currentCharge.getTaxPercent().divide(new BigDecimal(100)); BigDecimal factor = currentCharge.getTaxPercent().divide(new BigDecimal(100));
@@ -175,7 +176,8 @@ public class TransactionCalculator implements IAbsoluteValueProvider {
for (IZUGFeRDAllowanceCharge currentAllowance : allowances) { for (IZUGFeRDAllowanceCharge currentAllowance : allowances) {
VATAmount theAmount = hm.get(currentAllowance.getTaxPercent().stripTrailingZeros()); VATAmount theAmount = hm.get(currentAllowance.getTaxPercent().stripTrailingZeros());
if (theAmount == null) { 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))); theAmount.setBasis(theAmount.getBasis().subtract(currentAllowance.getTotalAmount(this)));
BigDecimal factor = currentAllowance.getTaxPercent().divide(new BigDecimal(100)); BigDecimal factor = currentAllowance.getTaxPercent().divide(new BigDecimal(100));