diff --git a/src/main/java/ZUV/ZUGFeRDValidator.java b/src/main/java/ZUV/ZUGFeRDValidator.java index 5b6fd82..deba742 100644 --- a/src/main/java/ZUV/ZUGFeRDValidator.java +++ b/src/main/java/ZUV/ZUGFeRDValidator.java @@ -31,7 +31,7 @@ public class ZUGFeRDValidator { /*** * within the validation it turned out something in the options was wrong, e.g. the file did not exist. - * recommendation to show the help text again + * recommendation to show the help text again. Should be false if XML or PDF file was found */ public boolean hasOptionsError() { return !optionsRecognized; diff --git a/src/main/resources/xslt/zugferd2p0_en16931.xslt b/src/main/resources/xslt/zugferd2p0_en16931.xslt index f1b575d..48c71de 100644 --- a/src/main/resources/xslt/zugferd2p0_en16931.xslt +++ b/src/main/resources/xslt/zugferd2p0_en16931.xslt @@ -12988,10 +12988,10 @@ - + + test="(ram:TaxBasisTotalAmount = (round(ram:LineTotalAmount*100 - ram:AllowanceTotalAmount*100 + ram:ChargeTotalAmount*100) div 100)) or ((ram:TaxBasisTotalAmount = (round(ram:LineTotalAmount*100 - ram:AllowanceTotalAmount*100) div 100)) and not (ram:ChargeTotalAmount)) or ((ram:TaxBasisTotalAmount = (round(ram:LineTotalAmount*100 + ram:ChargeTotalAmount*100) div 100)) and not (ram:AllowanceTotalAmount)) or ((ram:TaxBasisTotalAmount = (round(ram:LineTotalAmount * 100) div 100)) and not (ram:ChargeTotalAmount) and not (ram:AllowanceTotalAmount))"> @@ -13016,10 +13016,10 @@ - + + test="(ram:DuePayableAmount = (round(ram:GrandTotalAmount*100 - ram:TotalPrepaidAmount*100 + ram:RoundingAmount*100) div 100)) or ((ram:DuePayableAmount = ram:GrandTotalAmount + ram:RoundingAmount) and not (ram:TotalPrepaidAmount)) or ((ram:DuePayableAmount = (round(ram:GrandTotalAmount*100 - ram:TotalPrepaidAmount*100) div 100)) and not (ram:RoundingAmount)) or ((ram:DuePayableAmount = (round(ram:GrandTotalAmount*100) div 100)) and not (ram:TotalPrepaidAmount) and not (ram:RoundingAmount))"> diff --git a/src/main/resources/zugferd2p0_en16931.sch b/src/main/resources/zugferd2p0_en16931.sch index 96282e4..3bb9733 100755 --- a/src/main/resources/zugferd2p0_en16931.sch +++ b/src/main/resources/zugferd2p0_en16931.sch @@ -364,11 +364,11 @@ Der Inhalt des Elementes „Sum of allowances on document level“ (BT-107) entspricht der Summe aller Inhalte der Elemente „Document level allowance amount“ (BT-92). Der Inhalt des Elementes „Sum of charges on document level“ (BT-108) entspricht der Summe aller Inhalte der Elemente „Document level charge amount“ (BT-99). - + Der Inhalt des Elementes „Invoice total amount without VAT“ (BT-109) entspricht der Summe aller Inhalte der Elemente „Invoice line net amount“ (BT-131) abzüglich der Summe aller in der Rechnung enthaltenen Nachlässe der Dokumentenebene „Sum of allowances on document level“ (BT-107) zuzüglich der Summe aller in der Rechnung enthaltenen Abgaben der Dokumentenebene „Sum of charges on document level“ (BT-108). Der Inhalt des Elementes „Invoice total amount with VAT“ (BT-112) entspricht der Summe des Inhalts des Elementes „Invoice total amount without VAT“ (BT-109) und des Elementes „Invoice total VAT amount“ (BT-110). - + Der Inhalt des Elementes „Amount due for payment“ (BT-115) entspricht dem Inhalt des Elementes „Invoice total VAT amount“ (BT-110) abzüglich dem Inhalt des Elementes „Paid amount“ (BT-113) zuzüglich dem Inhalt des Elementes „Rounding amount“ (BT-114). The allowed maximum number of decimals for the Sum of Invoice line net amount (BT-106) is 2.