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

failing tests down from 10 to 7

Browse Source
This commit is contained in:
jstaerk
2025-05-21 12:20:38 +02:00
parent d0c213b495
commit dea5372688
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,13 +8,13 @@ import java.math.RoundingMode;
* @see TransactionCalculator * @see TransactionCalculator
*/ */
public class LineCalculator { public class LineCalculator {
private final BigDecimal price; protected BigDecimal price;
private final BigDecimal priceGross; protected BigDecimal priceGross;
private final BigDecimal itemTotalNetAmount; protected BigDecimal itemTotalNetAmount;
private final BigDecimal itemTotalVATAmount; protected BigDecimal itemTotalVATAmount;
private BigDecimal allowance = BigDecimal.ZERO; protected BigDecimal allowance = BigDecimal.ZERO;
private BigDecimal charge = BigDecimal.ZERO; protected BigDecimal charge = BigDecimal.ZERO;
private BigDecimal allowanceItemTotal = BigDecimal.ZERO; protected BigDecimal allowanceItemTotal = BigDecimal.ZERO;
public LineCalculator(IZUGFeRDExportableItem currentItem) { public LineCalculator(IZUGFeRDExportableItem currentItem) {
@@ -63,6 +63,7 @@ public class LineCalculator {
price=currentItem.getPrice(); price=currentItem.getPrice();
priceGross=price; priceGross=price;
price=price.subtract(allowance).add(charge);
// BigDecimal delta=charge.subtract(allowanceItemTotal).subtract(allowance); // BigDecimal delta=charge.subtract(allowanceItemTotal).subtract(allowance);
// delta=delta.divide(currentItem.getQuantity(), 18, RoundingMode.HALF_UP); // delta=delta.divide(currentItem.getQuantity(), 18, RoundingMode.HALF_UP);
// priceGross=currentItem.getPrice().add(delta); // priceGross=currentItem.getPrice().add(delta);
@@ -72,7 +73,7 @@ public class LineCalculator {
? BigDecimal.ONE.setScale(4) ? BigDecimal.ONE.setScale(4)
: currentItem.getBasisQuantity(); : currentItem.getBasisQuantity();
itemTotalNetAmount = quantity.multiply(price).divide(basisQuantity, 18, RoundingMode.HALF_UP) itemTotalNetAmount = quantity.multiply(price).divide(basisQuantity, 18, RoundingMode.HALF_UP)
.subtract(allowanceItemTotal).subtract(allowance).add(charge).setScale(2, RoundingMode.HALF_UP); .subtract(allowanceItemTotal).setScale(2, RoundingMode.HALF_UP);
itemTotalVATAmount = itemTotalNetAmount.multiply(multiplicator); itemTotalVATAmount = itemTotalNetAmount.multiply(multiplicator);
} }