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

Merge branch 'langfr-feature/1022'

Browse Source
This commit is contained in:
langfr
2026-04-25 14:26:13 +01:00
parent 15c696c54a 2490d1caf9
commit edddec1320
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
library/src/main/java/org/mustangproject/CashDiscount.java
View File

@@ -21,7 +21,9 @@ public class CashDiscount implements IZUGFeRDCashDiscount {
/*** /***
* the period (usually days) count how long the percent apply * the period (usually days) count how long the percent apply
*/ */
protected Integer days=null; protected Integer days;
protected BigDecimal basisAmount;
/*** /***
* Create a cash discount (skonto) with the specified height in the specified period. * Create a cash discount (skonto) with the specified height in the specified period.
@@ -61,18 +63,31 @@ public class CashDiscount implements IZUGFeRDCashDiscount {
return this; return this;
} }
public BigDecimal getBasisAmount() {
return basisAmount;
}
public CashDiscount setBasisAmount(BigDecimal basisAmount) {
this.basisAmount = basisAmount;
return this;
}
/*** /***
* @return this particular cash discount as cross industry invoice XML * @return this particular cash discount as cross industry invoice XML
*/ */
@JsonIgnore @JsonIgnore
public String getAsCII() { public String getAsCII() {
return "<ram:SpecifiedTradePaymentTerms>"+ String s = "<ram:SpecifiedTradePaymentTerms>"
"<ram:Description>Cash Discount</ram:Description>"+ + " <ram:Description>Cash Discount</ram:Description>"
" <ram:ApplicableTradePaymentDiscountTerms>"+ + " <ram:ApplicableTradePaymentDiscountTerms>"
" <ram:BasisPeriodMeasure unitCode=\"DAY\">"+days+"</ram:BasisPeriodMeasure>"+ + " <ram:BasisPeriodMeasure unitCode=\"DAY\">" + days + "</ram:BasisPeriodMeasure>";
" <ram:CalculationPercent>"+XMLTools.nDigitFormat(percent,3)+"</ram:CalculationPercent>"+ if (basisAmount != null) {
s += " <ram:BasisAmount>" + XMLTools.nDigitFormat(basisAmount, 2) + "</ram:BasisAmount>";
}
s += " <ram:CalculationPercent>"+XMLTools.nDigitFormat(percent,3)+"</ram:CalculationPercent>"+
" </ram:ApplicableTradePaymentDiscountTerms>"+ " </ram:ApplicableTradePaymentDiscountTerms>"+
"</ram:SpecifiedTradePaymentTerms>"; "</ram:SpecifiedTradePaymentTerms>";
return s;
} }
/*** /***
@@ -84,8 +99,4 @@ public class CashDiscount implements IZUGFeRDCashDiscount {
public String getAsXRechnung() { public String getAsXRechnung() {
return "#SKONTO#TAGE="+days+"#PROZENT="+XMLTools.nDigitFormat(percent,2)+"#\n"; return "#SKONTO#TAGE="+days+"#PROZENT="+XMLTools.nDigitFormat(percent,2)+"#\n";
} }
} }