invoice.git

@@ -47,8 +47,8 @@ class InvoiceTable(object):

                'count': e['count'],

                'unit': e['unit'],

                'subject': e['subject'],

-               'price': Decimal(e['price']),

-               'total': Decimal(e['price'] * e['count']),

+               'price': e['price'],

+               'total': e['price'] * e['count'],

                'vat': Decimal(e['vat']),

                'tender': False,

                'print_date': True,

@@ -149,9 +149,14 @@ def InvoiceToXML(invoice):

     # Line Items

     summe_netto = Decimal('0.0')

+    summe_brutto_rechnerisch = Decimal('0.0')

     summe_brutto = Decimal('0.0')

     summe_bezahlt = Decimal('0.0')

     summe_ust = Decimal('0.0')

+    summe_rundung = Decimal('0.0')

+    # Problem: Die Rechnung muss netto gestellt werden. Wenn wir die Rechnungsposten brutto erfassen, ergibt sich ein Rundungsfehler.

+    # Daher konvertieren wir die Line-Items in stimmige Netto-Items und erfassen für jeden Posten einen Rundungsbetrag,

+    # um den wir abgewichen sind.

     line_id_count = 0

     textparts = []

     for part in invoice.parts:

@@ -160,6 +165,9 @@ def InvoiceToXML(invoice):

         if isinstance(part, InvoiceTable):

             last_title = None

             for el in part.entries:

+                from pprint import pprint

+                pprint(el)

+

                 if el['type'] == 'title':

                     # Diese Information ist im XML nicht auf diese Weise darstellbar

                     last_title = el['title']

@@ -186,7 +194,7 @@ def InvoiceToXML(invoice):

                     for key, value in UNITS.items():

                         if el['unit'] in value:

                             unit = key

-                li.delivery.billed_quantity = (Decimal(el['count']), unit)

+                li.delivery.billed_quantity = (Decimal(f"{el['count']:.4f}"), unit)

                 # C62 = ohne Einheit

                 # H87 = Stück

                 # MON = Month, SEC = second, MIN = minute, HUR = hour, DAY = day, WEE = week, ANN = year

@@ -211,23 +219,25 @@ def InvoiceToXML(invoice):

                 # K = Intra-Community supply (specific reverse charge)

                 # G = Exempt VAT for Export outside EU

                 # O = Outside VAT scope

-                li.settlement.trade_tax.rate_applicable_percent = Decimal(f"{el['vat'] * 100:.1f}")

+                li.settlement.trade_tax.rate_applicable_percent = Decimal(f"{el['vat'] * 100:.2f}")

                 nettopreis = el['price']

                 if part.vatType == 'gross':

-                    nettopreis = el['price'] / (1 + el['vat'])

-                li.agreement.net.amount = Decimal(f"{nettopreis:.2f}")

+                    nettopreis = el['price'] / (el['vat'] + 1)

+                nettopreis = round(nettopreis, 2)

+                li.agreement.net.amount = nettopreis

-                nettosumme = el['total']

-                if part.vatType == 'gross':

-                    nettosumme = el['total'] / (1 + el['vat'])

+                nettosumme = nettopreis * el['count']

                 li.settlement.monetary_summation.total_amount = Decimal(f"{nettosumme:.2f}")

+                brutto_rechnerisch = round(nettosumme * (el['vat'] + 1), 2)

                 summe_netto += nettosumme

                 if part.vatType == 'net':

-                    summe_brutto += el['total'] * (1 + el['vat'])

+                    summe_brutto += el['total'] * (el['vat'] + 1)

                 else:

                     summe_brutto += el['total']

+                summe_brutto_rechnerisch += brutto_rechnerisch

+                summe_rundung += (el['total'] - brutto_rechnerisch)

                 doc.trade.items.add(li)

             for pay in part.payments:

@@ -265,7 +275,6 @@ def InvoiceToXML(invoice):

         note.content.add(paragraph)

         doc.header.notes.add(note)

-    rest = summe_brutto - summe_bezahlt

     if invoice.creditor_reference_id:

         # Gläubiger-ID für SEPA

@@ -298,13 +307,18 @@ def InvoiceToXML(invoice):

         terms.description = 'Wir buchen von Ihrem Konto ab.'

     doc.trade.settlement.terms.add(terms)

+    summe_brutto = round(summe_brutto, 2)

+    rest = summe_brutto - summe_bezahlt

+    summe_netto = round(summe_netto, 2)

+    summe_ust = round(summe_ust, 2)

     doc.trade.settlement.monetary_summation.line_total = Decimal(f"{summe_netto:.2f}")

     doc.trade.settlement.monetary_summation.charge_total = Decimal("0.00")

     doc.trade.settlement.monetary_summation.allowance_total = Decimal("0.00")

     doc.trade.settlement.monetary_summation.tax_basis_total = Decimal(f"{summe_netto:.2f}")

     doc.trade.settlement.monetary_summation.tax_total = (Decimal(f"{summe_ust:.2f}"), "EUR")

+    doc.trade.settlement.monetary_summation.grand_total = Decimal(f"{summe_brutto_rechnerisch:.2f}")

     doc.trade.settlement.monetary_summation.prepaid_total = Decimal(f"{summe_bezahlt:.2f}")

-    doc.trade.settlement.monetary_summation.grand_total = Decimal(f"{summe_brutto:.2f}")

+    doc.trade.settlement.monetary_summation.rounding_amount = summe_rundung

     doc.trade.settlement.monetary_summation.due_amount = Decimal(f"{rest:.2f}")

     # Generate XML file

@@ -94,8 +94,8 @@ if __name__ == '__main__':

     tab.addTitle("Zwischenüberschrift in der Tabelle")

     for item in data:

         # Der Betrag muss immer positiv sein, bei Gutschriften wird nur die Anzahl negativ.

-        count = float(item['anzahl'])

-        price = float(item['betrag'])

+        count = item['anzahl']

+        price = item['betrag']

         if price < 0:

             count = -count

             price = abs(price)