diff --git a/History.md b/History.md index 1636a1c5..410c3a70 100644 --- a/History.md +++ b/History.md @@ -4,6 +4,7 @@ - #969 - #984 - #983 +- #979 2.20.0 ======= diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java index 50565ecc..ded4e1b6 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java @@ -538,8 +538,15 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { xml += "" + XMLTools.encodeXML(currentItem.getProduct().getTaxExemptionReason()) + ""; } xml += "" + currentItem.getProduct().getTaxCategoryCode() + ""; - if ((!currentItem.getProduct().getTaxCategoryCode().equals(TaxCategoryCodeTypeConstants.UNTAXEDSERVICE)) && (!currentItem.getProduct().getTaxCategoryCode().equals(TaxCategoryCodeTypeConstants.ZEROTAXPRODUCTS))) { - xml += "" + vatFormat(currentItem.getProduct().getVATPercent()) + ""; + BigDecimal vatValue=BigDecimal.ZERO; + if (currentItem.getProduct().getTaxCategoryCode().equals(TaxCategoryCodeTypeConstants.ZEROTAXPRODUCTS)) { + vatValue=BigDecimal.ZERO; + } else { + vatValue=currentItem.getProduct().getVATPercent(); + } + + if ((!currentItem.getProduct().getTaxCategoryCode().equals(TaxCategoryCodeTypeConstants.UNTAXEDSERVICE)) ) { + xml += "" + vatFormat(vatValue) + ""; } xml += "";