Skip to content

Commit 665877b

Browse files
authored
Add new fields line monetary summation (#92)
* Add new fields to SpecifiedTradeSettlementLineMonetarySummation (2.3) * add test values
1 parent 1583663 commit 665877b

File tree

2 files changed

+43
-1
lines changed

2 files changed

+43
-1
lines changed

drafthorse/models/tradelines.py

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,39 @@ class Meta:
141141

142142
class LineSummation(Element):
143143
total_amount = DecimalField(
144-
NS_RAM, "LineTotalAmount", required=True, profile=COMFORT
144+
NS_RAM,
145+
"LineTotalAmount",
146+
required=True,
147+
profile=COMFORT,
148+
_d="Nettobetrag der Rechnungsposition",
149+
)
150+
charge_total = DecimalField(
151+
NS_RAM,
152+
"ChargeTotalAmount",
153+
required=False,
154+
profile=EXTENDED,
155+
_d="Gesamtbetrag der Positionszuschläge",
156+
)
157+
allowance_total = DecimalField(
158+
NS_RAM,
159+
"AllowanceTotalAmount",
160+
required=False,
161+
profile=EXTENDED,
162+
_d="Gesamtbetrag der Positionsabschläge",
163+
)
164+
tax_total = DecimalField(
165+
NS_RAM,
166+
"TaxTotalAmount",
167+
required=False,
168+
profile=EXTENDED,
169+
_d="Gesamtbetrag der Positionssteuern",
170+
)
171+
grand_total = DecimalField(
172+
NS_RAM,
173+
"GrandTotalAmount",
174+
required=False,
175+
profile=EXTENDED,
176+
_d="Gesamtbruttobetrag der Position",
145177
)
146178
total_allowance_charge = DecimalField(
147179
NS_RAM,

tests/samples/zugferd_2p3_EXTENDED_Kostenrechnung.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ GLN 4304171000002
160160
</ram:ApplicableTradeTax>
161161
<ram:SpecifiedTradeSettlementLineMonetarySummation>
162162
<ram:LineTotalAmount>52.00</ram:LineTotalAmount>
163+
<ram:TaxTotalAmount>9.88</ram:TaxTotalAmount>
164+
<ram:GrandTotalAmount>61.88</ram:GrandTotalAmount>
163165
</ram:SpecifiedTradeSettlementLineMonetarySummation>
164166
</ram:SpecifiedLineTradeSettlement>
165167
</ram:IncludedSupplyChainTradeLineItem>
@@ -191,6 +193,8 @@ GLN 4304171000002
191193
</ram:ApplicableTradeTax>
192194
<ram:SpecifiedTradeSettlementLineMonetarySummation>
193195
<ram:LineTotalAmount>20.50</ram:LineTotalAmount>
196+
<ram:TaxTotalAmount>3.9</ram:TaxTotalAmount>
197+
<ram:GrandTotalAmount>24.4</ram:GrandTotalAmount>
194198
</ram:SpecifiedTradeSettlementLineMonetarySummation>
195199
</ram:SpecifiedLineTradeSettlement>
196200
</ram:IncludedSupplyChainTradeLineItem>
@@ -229,6 +233,8 @@ GLN 4304171000002
229233
</ram:ApplicableTradeTax>
230234
<ram:SpecifiedTradeSettlementLineMonetarySummation>
231235
<ram:LineTotalAmount>288.75</ram:LineTotalAmount>
236+
<ram:TaxTotalAmount>54.86</ram:TaxTotalAmount>
237+
<ram:GrandTotalAmount>343.61</ram:GrandTotalAmount>
232238
</ram:SpecifiedTradeSettlementLineMonetarySummation>
233239
</ram:SpecifiedLineTradeSettlement>
234240
</ram:IncludedSupplyChainTradeLineItem>
@@ -260,6 +266,8 @@ GLN 4304171000002
260266
</ram:ApplicableTradeTax>
261267
<ram:SpecifiedTradeSettlementLineMonetarySummation>
262268
<ram:LineTotalAmount>36.75</ram:LineTotalAmount>
269+
<ram:TaxTotalAmount>6.98</ram:TaxTotalAmount>
270+
<ram:GrandTotalAmount>43.73</ram:GrandTotalAmount>
263271
</ram:SpecifiedTradeSettlementLineMonetarySummation>
264272
</ram:SpecifiedLineTradeSettlement>
265273
</ram:IncludedSupplyChainTradeLineItem>
@@ -296,6 +304,8 @@ GLN 4304171000002
296304
</ram:ApplicableTradeTax>
297305
<ram:SpecifiedTradeSettlementLineMonetarySummation>
298306
<ram:LineTotalAmount>12.10</ram:LineTotalAmount>
307+
<ram:TaxTotalAmount>2.30</ram:TaxTotalAmount>
308+
<ram:GrandTotalAmount>14.40</ram:GrandTotalAmount>
299309
</ram:SpecifiedTradeSettlementLineMonetarySummation>
300310
</ram:SpecifiedLineTradeSettlement>
301311
</ram:IncludedSupplyChainTradeLineItem>

0 commit comments

Comments
 (0)