PayableRoundingAmount BT-114

Author: landrix

intf.Invoice.pas

@@ -599,6 +599,7 @@   TInvoice = class(TObject)
     AllowanceTotalAmount : Currency;
     ChargeTotalAmount : Currency;
     PrepaidAmount : Currency;
+    PayableRoundingAmount : Currency; //BT-114
     PayableAmount : Currency;
   public
     constructor Create;
@@ -648,6 +649,15 @@ procedure TInvoice.Clear;
   Notes.Clear;
   TaxAmountSubtotals.Clear;
   PaymentTermsType := iptt_None;
+
+  LineAmount := 0;
+  TaxExclusiveAmount := 0;
+  TaxInclusiveAmount := 0;
+  AllowanceTotalAmount := 0;
+  ChargeTotalAmount := 0;
+  PrepaidAmount := 0;
+  PayableRoundingAmount := 0;
+  PayableAmount := 0;
 end;
 
 { TInvoiceLines }

intf.XRechnung_2_3.pas

@@ -327,6 +327,7 @@ class function TXRechnungInvoiceAdapter230.LoadDocumentUBL(_Invoice: TInvoice;
     _Invoice.AllowanceTotalAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(xml,'//cac:LegalMonetaryTotal/cbc:AllowanceTotalAmount'));
     _Invoice.ChargeTotalAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(xml,'//cac:LegalMonetaryTotal/cbc:ChargeTotalAmount'));
     _Invoice.PrepaidAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(xml,'//cac:LegalMonetaryTotal/cbc:PrepaidAmount'));
+    _Invoice.PayableRoundingAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(xml,'//cac:LegalMonetaryTotal/cbc:PayableRoundingAmount'));
     _Invoice.PayableAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(xml,'//cac:LegalMonetaryTotal/cbc:PayableAmount'));
 
     if TXRechnungXMLHelper.SelectNodes(xml,'.//cac:InvoiceLine',nodes) then
@@ -791,6 +792,7 @@ class function TXRechnungInvoiceAdapter230.LoadDocumentUNCEFACT(_Invoice: TInvoi
           _Invoice.TaxCurrencyCode := TXRechnungXMLHelper.SelectAttributeText(node,'currencyID');
           _Invoice.TaxAmountTotal := TXRechnungHelper.AmountFromStr(node.text);
         end;
+        _Invoice.PayableRoundingAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(node2,'.//ram:RoundingAmount'));
         _Invoice.TaxInclusiveAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(node2,'.//ram:GrandTotalAmount'));
         _Invoice.PrepaidAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(node2,'.//ram:TotalPrepaidAmount'));
         _Invoice.PayableAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(node2,'.//ram:DuePayableAmount'));
@@ -1335,7 +1337,12 @@ class procedure TXRechnungInvoiceAdapter230.SaveDocumentUBL(_Invoice: TInvoice;
         Attributes['currencyID'] := _Invoice.TaxCurrencyCode;
         Text := TXRechnungHelper.AmountToStr(_Invoice.PrepaidAmount);
       end;
-      //      <cbc:PayableRoundingAmount currencyID="EUR">0</cbc:PayableRoundingAmount>
+      if _Invoice.PayableRoundingAmount <> 0.0 then
+      with AddChild('cbc:PayableRoundingAmount') do
+      begin
+        Attributes['currencyID'] := _Invoice.TaxCurrencyCode;
+        Text := TXRechnungHelper.AmountToStr(_Invoice.PayableRoundingAmount);
+      end;
       with AddChild('cbc:PayableAmount') do
       begin
         Attributes['currencyID'] := _Invoice.TaxCurrencyCode;
@@ -1804,7 +1811,8 @@ class procedure TXRechnungInvoiceAdapter230.SaveDocumentUNCEFACT(
           Attributes['currencyID'] := _Invoice.TaxCurrencyCode;
           Text :=  TXRechnungHelper.AmountToStr(_Invoice.TaxAmountTotal);
         end;
-        //        <ram:RoundingAmount>0</ram:RoundingAmount>
+        if _Invoice.PayableRoundingAmount <> 0.0 then
+          AddChild('ram:RoundingAmount').Text := TXRechnungHelper.AmountToStr(_Invoice.PayableRoundingAmount);
         AddChild('ram:GrandTotalAmount').Text := TXRechnungHelper.AmountToStr(_Invoice.TaxInclusiveAmount);
         AddChild('ram:TotalPrepaidAmount').Text := TXRechnungHelper.AmountToStr(_Invoice.PrepaidAmount);
         AddChild('ram:DuePayableAmount').Text := TXRechnungHelper.AmountToStr(_Invoice.PayableAmount);

intf.XRechnung_3_0.pas

@@ -327,6 +327,7 @@ class function TXRechnungInvoiceAdapter301.LoadDocumentUBL(_Invoice: TInvoice;
     _Invoice.AllowanceTotalAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(xml,'//cac:LegalMonetaryTotal/cbc:AllowanceTotalAmount'));
     _Invoice.ChargeTotalAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(xml,'//cac:LegalMonetaryTotal/cbc:ChargeTotalAmount'));
     _Invoice.PrepaidAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(xml,'//cac:LegalMonetaryTotal/cbc:PrepaidAmount'));
+    _Invoice.PayableRoundingAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(xml,'//cac:LegalMonetaryTotal/cbc:PayableRoundingAmount'));
     _Invoice.PayableAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(xml,'//cac:LegalMonetaryTotal/cbc:PayableAmount'));
 
     if TXRechnungXMLHelper.SelectNodes(xml,'.//cac:InvoiceLine',nodes) then
@@ -791,6 +792,7 @@ class function TXRechnungInvoiceAdapter301.LoadDocumentUNCEFACT(_Invoice: TInvoi
           _Invoice.TaxCurrencyCode := TXRechnungXMLHelper.SelectAttributeText(node,'currencyID');
           _Invoice.TaxAmountTotal := TXRechnungHelper.AmountFromStr(node.text);
         end;
+        _Invoice.PayableRoundingAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(node2,'.//ram:RoundingAmount'));
         _Invoice.TaxInclusiveAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(node2,'.//ram:GrandTotalAmount'));
         _Invoice.PrepaidAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(node2,'.//ram:TotalPrepaidAmount'));
         _Invoice.PayableAmount := TXRechnungHelper.AmountFromStr(TXRechnungXMLHelper.SelectNodeText(node2,'.//ram:DuePayableAmount'));
@@ -1336,7 +1338,12 @@ class procedure TXRechnungInvoiceAdapter301.SaveDocumentUBL(_Invoice: TInvoice;
         Attributes['currencyID'] := _Invoice.TaxCurrencyCode;
         Text := TXRechnungHelper.AmountToStr(_Invoice.PrepaidAmount);
       end;
-      //      <cbc:PayableRoundingAmount currencyID="EUR">0</cbc:PayableRoundingAmount>
+      if _Invoice.PayableRoundingAmount <> 0.0 then
+      with AddChild('cbc:PayableRoundingAmount') do
+      begin
+        Attributes['currencyID'] := _Invoice.TaxCurrencyCode;
+        Text := TXRechnungHelper.AmountToStr(_Invoice.PayableRoundingAmount);
+      end;
       with AddChild('cbc:PayableAmount') do
       begin
         Attributes['currencyID'] := _Invoice.TaxCurrencyCode;
@@ -1810,7 +1817,8 @@ class procedure TXRechnungInvoiceAdapter301.SaveDocumentUNCEFACT(
           Attributes['currencyID'] := _Invoice.TaxCurrencyCode;
           Text :=  TXRechnungHelper.AmountToStr(_Invoice.TaxAmountTotal);
         end;
-        //        <ram:RoundingAmount>0</ram:RoundingAmount>
+        if _Invoice.PayableRoundingAmount <> 0.0 then
+          AddChild('ram:RoundingAmount').Text := TXRechnungHelper.AmountToStr(_Invoice.PayableRoundingAmount);
         AddChild('ram:GrandTotalAmount').Text := TXRechnungHelper.AmountToStr(_Invoice.TaxInclusiveAmount);
         AddChild('ram:TotalPrepaidAmount').Text := TXRechnungHelper.AmountToStr(_Invoice.PrepaidAmount);
         AddChild('ram:DuePayableAmount').Text := TXRechnungHelper.AmountToStr(_Invoice.PayableAmount);