closes #979
This commit is contained in:
@@ -4,6 +4,7 @@
|
|||||||
- #969
|
- #969
|
||||||
- #984
|
- #984
|
||||||
- #983
|
- #983
|
||||||
|
- #979
|
||||||
|
|
||||||
2.20.0
|
2.20.0
|
||||||
=======
|
=======
|
||||||
|
|||||||
@@ -538,8 +538,15 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
|
|||||||
xml += "<ram:ExemptionReason>" + XMLTools.encodeXML(currentItem.getProduct().getTaxExemptionReason()) + "</ram:ExemptionReason>";
|
xml += "<ram:ExemptionReason>" + XMLTools.encodeXML(currentItem.getProduct().getTaxExemptionReason()) + "</ram:ExemptionReason>";
|
||||||
}
|
}
|
||||||
xml += "<ram:CategoryCode>" + currentItem.getProduct().getTaxCategoryCode() + "</ram:CategoryCode>";
|
xml += "<ram:CategoryCode>" + currentItem.getProduct().getTaxCategoryCode() + "</ram:CategoryCode>";
|
||||||
if ((!currentItem.getProduct().getTaxCategoryCode().equals(TaxCategoryCodeTypeConstants.UNTAXEDSERVICE)) && (!currentItem.getProduct().getTaxCategoryCode().equals(TaxCategoryCodeTypeConstants.ZEROTAXPRODUCTS))) {
|
BigDecimal vatValue=BigDecimal.ZERO;
|
||||||
xml += "<ram:RateApplicablePercent>" + vatFormat(currentItem.getProduct().getVATPercent()) + "</ram:RateApplicablePercent>";
|
if (currentItem.getProduct().getTaxCategoryCode().equals(TaxCategoryCodeTypeConstants.ZEROTAXPRODUCTS)) {
|
||||||
|
vatValue=BigDecimal.ZERO;
|
||||||
|
} else {
|
||||||
|
vatValue=currentItem.getProduct().getVATPercent();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((!currentItem.getProduct().getTaxCategoryCode().equals(TaxCategoryCodeTypeConstants.UNTAXEDSERVICE)) ) {
|
||||||
|
xml += "<ram:RateApplicablePercent>" + vatFormat(vatValue) + "</ram:RateApplicablePercent>";
|
||||||
}
|
}
|
||||||
xml += "</ram:ApplicableTradeTax>";
|
xml += "</ram:ApplicableTradeTax>";
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user