Add new fields line monetary summation (#92)

* Add new fields to SpecifiedTradeSettlementLineMonetarySummation (2.3)

* add test values

diff --git a/drafthorse/models/tradelines.py b/drafthorse/models/tradelines.py
index dd2a9210b128558b60bce2f4923c9e5306450d22..e40dbf9b5fd331f30d4b8037b454e1caef53fb45 100644 (file)
--- a/drafthorse/models/tradelines.py
+++ b/drafthorse/models/tradelines.py
@@ -141,7 +141,39 @@ class LineDelivery(Element):
 
 class LineSummation(Element):
     total_amount = DecimalField(
-        NS_RAM, "LineTotalAmount", required=True, profile=COMFORT
+        NS_RAM,
+        "LineTotalAmount",
+        required=True,
+        profile=COMFORT,
+        _d="Nettobetrag der Rechnungsposition",
+    )
+    charge_total = DecimalField(
+        NS_RAM,
+        "ChargeTotalAmount",
+        required=False,
+        profile=EXTENDED,
+        _d="Gesamtbetrag der Positionszuschläge",
+    )
+    allowance_total = DecimalField(
+        NS_RAM,
+        "AllowanceTotalAmount",
+        required=False,
+        profile=EXTENDED,
+        _d="Gesamtbetrag der Positionsabschläge",
+    )
+    tax_total = DecimalField(
+        NS_RAM,
+        "TaxTotalAmount",
+        required=False,
+        profile=EXTENDED,
+        _d="Gesamtbetrag der Positionssteuern",
+    )
+    grand_total = DecimalField(
+        NS_RAM,
+        "GrandTotalAmount",
+        required=False,
+        profile=EXTENDED,
+        _d="Gesamtbruttobetrag der Position",
     )
     total_allowance_charge = DecimalField(
         NS_RAM,

diff --git a/tests/samples/zugferd_2p3_EXTENDED_Kostenrechnung.xml b/tests/samples/zugferd_2p3_EXTENDED_Kostenrechnung.xml
index 548e5434c34a999a71e6e84e3d1c80427f4f3fea..d30f458d864a02114d3bed2b4908b82f23509117 100644 (file)
--- a/tests/samples/zugferd_2p3_EXTENDED_Kostenrechnung.xml
+++ b/tests/samples/zugferd_2p3_EXTENDED_Kostenrechnung.xml
@@ -160,6 +160,8 @@ GLN 4304171000002
                                </ram:ApplicableTradeTax>\r
                                <ram:SpecifiedTradeSettlementLineMonetarySummation>\r
                                        <ram:LineTotalAmount>52.00</ram:LineTotalAmount>\r
+                                       <ram:TaxTotalAmount>9.88</ram:TaxTotalAmount>\r
+                                       <ram:GrandTotalAmount>61.88</ram:GrandTotalAmount>\r
                                </ram:SpecifiedTradeSettlementLineMonetarySummation>\r
                        </ram:SpecifiedLineTradeSettlement>\r
                </ram:IncludedSupplyChainTradeLineItem>\r
@@ -191,6 +193,8 @@ GLN 4304171000002
                                </ram:ApplicableTradeTax>\r
                                <ram:SpecifiedTradeSettlementLineMonetarySummation>\r
                                        <ram:LineTotalAmount>20.50</ram:LineTotalAmount>\r
+                                       <ram:TaxTotalAmount>3.9</ram:TaxTotalAmount>\r
+                                       <ram:GrandTotalAmount>24.4</ram:GrandTotalAmount>\r
                                </ram:SpecifiedTradeSettlementLineMonetarySummation>\r
                        </ram:SpecifiedLineTradeSettlement>\r
                </ram:IncludedSupplyChainTradeLineItem>\r
@@ -229,6 +233,8 @@ GLN 4304171000002
                                </ram:ApplicableTradeTax>\r
                                <ram:SpecifiedTradeSettlementLineMonetarySummation>\r
                                        <ram:LineTotalAmount>288.75</ram:LineTotalAmount>\r
+                                       <ram:TaxTotalAmount>54.86</ram:TaxTotalAmount>\r
+                                       <ram:GrandTotalAmount>343.61</ram:GrandTotalAmount>\r
                                </ram:SpecifiedTradeSettlementLineMonetarySummation>\r
                        </ram:SpecifiedLineTradeSettlement>\r
                </ram:IncludedSupplyChainTradeLineItem>\r
@@ -260,6 +266,8 @@ GLN 4304171000002
                                </ram:ApplicableTradeTax>\r
                                <ram:SpecifiedTradeSettlementLineMonetarySummation>\r
                                        <ram:LineTotalAmount>36.75</ram:LineTotalAmount>\r
+                                       <ram:TaxTotalAmount>6.98</ram:TaxTotalAmount>\r
+                                       <ram:GrandTotalAmount>43.73</ram:GrandTotalAmount>\r
                                </ram:SpecifiedTradeSettlementLineMonetarySummation>\r
                        </ram:SpecifiedLineTradeSettlement>\r
                </ram:IncludedSupplyChainTradeLineItem>\r
@@ -296,6 +304,8 @@ GLN 4304171000002
                                </ram:ApplicableTradeTax>\r
                                <ram:SpecifiedTradeSettlementLineMonetarySummation>\r
                                        <ram:LineTotalAmount>12.10</ram:LineTotalAmount>\r
+                                       <ram:TaxTotalAmount>2.30</ram:TaxTotalAmount>\r
+                                       <ram:GrandTotalAmount>14.40</ram:GrandTotalAmount>\r
                                </ram:SpecifiedTradeSettlementLineMonetarySummation>\r
                        </ram:SpecifiedLineTradeSettlement>\r
                </ram:IncludedSupplyChainTradeLineItem>\r