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

corrected calculation

Browse Source
This commit is contained in:
jstaerk
2025-06-09 15:21:06 +02:00
parent 58f153fc46
commit da29a92e81
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
library/src/main/java/org/mustangproject/Allowance.java
View File

@@ -3,8 +3,10 @@ package org.mustangproject;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import org.mustangproject.ZUGFeRD.IAbsoluteValueProvider;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
/*** /***
* (absolute) allowances on item and document level * (absolute) allowances on item and document level
@@ -29,6 +31,22 @@ public class Allowance extends Charge {
} }
@Override
public BigDecimal getTotalAmount(IAbsoluteValueProvider currentItem) {
if(totalAmount != null) {
return totalAmount;
} else if (percent!=null) {
BigDecimal singlePrice=currentItem.getValue().divide(BigDecimal.ONE.add(getPercent().divide(new BigDecimal(100))), 18, RoundingMode.HALF_UP);
// BigDecimal singlePrice=currentItem.getValue().multiply(BigDecimal.ONE.subtract(getPercent().divide(new BigDecimal(100))));
BigDecimal singlePriceDiff=currentItem.getValue().subtract(singlePrice);
return singlePriceDiff;
} else {
throw new RuntimeException("percent must be set");
}
}
/*** /***
* Always to return false for IZUGFeRDAllowanceCharge * Always to return false for IZUGFeRDAllowanceCharge
* @return false since its not supposed to be calculated negatively * @return false since its not supposed to be calculated negatively

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

@@ -145,9 +145,9 @@ public class Charge implements IZUGFeRDAllowanceCharge {
if(totalAmount != null) { if(totalAmount != null) {
return totalAmount; return totalAmount;
} else if (percent!=null) { } else if (percent!=null) {
// BigDecimal singlePrice=currentItem.getValue().divide(BigDecimal.ONE.add(getPercent().divide(new BigDecimal(100))), 18, RoundingMode.HALF_UP); BigDecimal singlePrice=currentItem.getValue().divide(BigDecimal.ONE.add(getPercent().divide(new BigDecimal(100))), 18, RoundingMode.HALF_UP);
BigDecimal singlePrice=currentItem.getValue().multiply(BigDecimal.ONE.subtract(getPercent().divide(new BigDecimal(100)))); // BigDecimal singlePrice=currentItem.getValue().multiply(BigDecimal.ONE.subtract(getPercent().divide(new BigDecimal(100))));
BigDecimal singlePriceDiff=currentItem.getValue().subtract(singlePrice); BigDecimal singlePriceDiff=currentItem.getValue().add(singlePrice);
return singlePriceDiff; return singlePriceDiff;
} else { } else {
throw new RuntimeException("percent must be set"); throw new RuntimeException("percent must be set");

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

@@ -93,7 +93,7 @@ public class LineCalculator {
: currentItem.getBasisQuantity(); : currentItem.getBasisQuantity();
itemTotalNetAmount = quantity.multiply(price).divide(basisQuantity, 18, RoundingMode.HALF_UP) itemTotalNetAmount = quantity.multiply(price).divide(basisQuantity, 18, RoundingMode.HALF_UP)
.add(lineCharge).subtract(lineAllowance).subtract(allowanceItemTotal).setScale(2, RoundingMode.HALF_UP); .add(lineCharge).subtract(lineAllowance).subtract(allowanceItemTotal).setScale(2, RoundingMode.HALF_UP);
itemTotalVATAmount = itemTotalNetAmount.multiply(multiplicator); itemTotalVATAmount = itemTotalNetAmount.multiply(multiplicator).setScale(2, RoundingMode.HALF_UP);
} }
public BigDecimal getPrice() { public BigDecimal getPrice() {