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

still need to support basisamount

Browse Source
This commit is contained in:
jstaerk
2025-05-15 09:45:40 +02:00
parent df28d4f249
commit beb5241de6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/src/main/java/org/mustangproject/ZUGFeRD/LineCalculator.java
View File

@@ -22,8 +22,9 @@ public class LineCalculator {
for (IZUGFeRDAllowanceCharge allowance : currentItem.getItemAllowances()) { for (IZUGFeRDAllowanceCharge allowance : currentItem.getItemAllowances()) {
BigDecimal factor=BigDecimal.ONE; BigDecimal factor=BigDecimal.ONE;
BigDecimal singleAllowance=allowance.getTotalAmount(currentItem); BigDecimal singleAllowance=allowance.getTotalAmount(currentItem);
if ((allowance.getPercent()!=null)&&(allowance.getPercent().compareTo(BigDecimal.ZERO)!=0)) { if ((allowance.getPercent()!=null)&&(allowance.getPercent().compareTo(BigDecimal.ZERO)!=0)) {
factor=allowance.getPercent().divide(new BigDecimal(100), 18, RoundingMode.HALF_UP); factor=currentItem.getQuantity();
} }
addAllowance(singleAllowance.multiply(factor)); addAllowance(singleAllowance.multiply(factor));
@@ -34,7 +35,7 @@ public class LineCalculator {
BigDecimal factor=BigDecimal.ONE; BigDecimal factor=BigDecimal.ONE;
BigDecimal singleCharge=charge.getTotalAmount(currentItem); BigDecimal singleCharge=charge.getTotalAmount(currentItem);
if ((charge.getPercent()!=null)&&(charge.getPercent().compareTo(BigDecimal.ZERO)!=0)) { if ((charge.getPercent()!=null)&&(charge.getPercent().compareTo(BigDecimal.ZERO)!=0)) {
factor=charge.getPercent().divide(new BigDecimal(100), 18, RoundingMode.HALF_UP).multiply(currentItem.getQuantity()); factor=currentItem.getQuantity();
} }
addCharge(singleCharge.multiply(factor)); addCharge(singleCharge.multiply(factor));