invoice.git

@@ -24,7 +24,7 @@ class InvoiceText(object):

 class InvoiceTable(object):

-    def __init__(self, vatType='gross', tender=False, summary=True):

+    def __init__(self, vatType='net', tender=False, summary=True):

         self.entries = []

         self.vat = {}

         self.sum = Decimal('0.0')

@@ -43,11 +43,15 @@ class InvoiceTable(object):

         e = entry

         if not ('count' in k and 'unit' in k and 'subject' in k and 'price' in k and 'vat' in k):

             raise ValueError('Some data is missing!')

+        # Finde heraus, wie viele Dezimalstellen übergeben wurden, minimum aber 2.

+        digits = max(2, abs(Decimal(f"{e['price']}").as_tuple().exponent))

         ret = {'type': 'entry',

-               'count': e['count'],

+               'count': Decimal(f"{e['count']:.4f}"),

                'unit': e['unit'],

                'subject': e['subject'],

-               'price': e['price'],

+               'net_price': round(e['price'] if self.vatType == 'net' else e['price'] / Decimal(f"{e['vat'] + 1:.2f}"), digits),

+               'gross_price': round(e['price'] * (e['vat'] + 1) if self.vatType == 'net' else e['price'], digits),

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

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

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

                'tender': False,

@@ -74,9 +78,14 @@ class InvoiceTable(object):

         Typen sein"""

         d = self.validEntry(data)

         if not d['vat'] in self.vat.keys():

-            self.vat[d['vat']] = [0, chr(65+len(self.vat))]

+            self.vat[d['vat']] = {'char': chr(65+len(self.vat)), 'net': Decimal("0.00"),

+                                  'vat_amount': Decimal("0.00"), 'gross': Decimal("0.00"),

+                                  'vat': d['vat'],}

         if 'tender' not in data or not data['tender']:

-            self.vat[d['vat']][0] += d['total']

+            self.vat[d['vat']]['net'] += d['net_price'] * d['count']

+            self.vat[d['vat']]['gross'] += d['gross_price'] * d['count']

+            # vat wurde bereits vereinheitlicht auf einen Dezimalfaktor

+            self.vat[d['vat']]['vat_amount'] += d['net_price'] * d['count'] * d['vat']

             self.sum += d['total']

         self.entries.append(d)

@@ -9,7 +9,7 @@ from reportlab.pdfbase.ttfonts import TTFont, TTFError

 from reportlab.pdfgen import canvas

 from . import _formatPrice

-from .InvoiceObjects import InvoiceTable, InvoiceText, InvoiceImage, GUTSCHRIFT, KORREKTUR

+from .InvoiceObjects import InvoiceTable, InvoiceText, InvoiceImage, GUTSCHRIFT, KORREKTUR, VAT_INNERGEM

 def find_font_file(filename):

@@ -444,7 +444,7 @@ class PDF(object):

                             self.canvas.drawRightString(left + 13.3 * cm, self.y - self.font_height,

                                                         _formatPrice(el['price']))

                             self.canvas.drawString(left + 13.7 * cm, self.y - self.font_height,

-                                                   str(part.vat[el['vat']][1]))

+                                                   str(part.vat[el['vat']]['char']))

                         if el['tender']:

                             self.canvas.drawRightString(left + 16.8 * cm, self.y - self.font_height, 'eventual')

                         else:

@@ -493,31 +493,39 @@ class PDF(object):

                             self.canvas.setFont(self.font, font_size)

                             self.y -= self.line_height + self.line_padding

                             summaries = []

-                            vat = Decimal('0.0')

-                            if len(part.vat) == 1 and list(part.vat.keys())[0] == 0.0:

+                            netsum = Decimal('0.0')

+                            if len(part.vat) == 1 and Decimal("0.0") in part.vat:

+                                vat = list(part.vat.values())[0]

+                                netsum += vat['net']

+                                if self.invoice.vat_type == VAT_INNERGEM:

+                                    self.canvas.drawString(left, self.y - self.font_height,

+                                                           'Innergemeinschaftliche Lieferung ohne USt.')

+                                else:

                                     self.canvas.drawString(left, self.y - self.font_height,

                                                            'Dieser Beleg wurde ohne Ausweis von MwSt erstellt.')

                                 self.y -= self.line_height

                             else:

                                 if len(part.vat) == 1:

-                                    vat = list(part.vat.keys())[0]

+                                    vat = list(part.vat.values())[0]

+                                    netsum += vat['net']

                                     if self.invoice.tender:

-                                        summaries.append(('Im Gesamtbetrag sind %.1f%% MwSt enthalten:' % (vat * 100),

-                                                          _formatPrice((part.sum / (vat + 1)) * vat)))

+                                        summaries.append(('Im Gesamtbetrag sind %.1f%% MwSt enthalten:' % (vat['vat'] * 100),

+                                                          _formatPrice(vat['vat_amount'])))

                                     else:

                                         summaries.append((

-                                            'Im Rechnungsbetrag sind %.1f%% MwSt enthalten:' % (vat * 100),

-                                            _formatPrice((part.sum / (vat + 1)) * vat)))

+                                            'Im Rechnungsbetrag sind %.1f%% MwSt enthalten:' % (vat['vat'] * 100),

+                                            _formatPrice(vat['vat_amount'])))

                                 else:

-                                    for vat, vatdata in part.vat.items():

-                                        if vat > 0:

+                                    for vat in part.vat.values():

+                                        netsum += vat['net']

+                                        if vat['vat'] > 0:

                                             summaries.append(('%s: Im Teilbetrag von %s sind %.1f%% MwSt enthalten:' % (

-                                                vatdata[1], _formatPrice(vatdata[0]), vat * 100),

-                                                              _formatPrice((vatdata[0] / (vat + 1)) * vat)))

+                                                vat['char'], _formatPrice(vat['gross']), vat['vat'] * 100),

+                                                              _formatPrice(vat['vat_amount'])))

                                         else:

                                             summaries.append(('%s: Durchlaufende Posten ohne Berechnung von MwSt.' % (

-                                                vatdata[1]), Decimal('0.0')))

-                            summaries.append(('Nettobetrag:', _formatPrice(part.sum - (part.sum / (vat + 1)) * vat)))

+                                                vat['char']), Decimal('0.0')))

+                            summaries.append(('Nettobetrag:', _formatPrice(netsum)))

                             summaries.sort()

                             for line in summaries:

                                 self.canvas.drawRightString(left + 11.5 * cm, self.y - self.font_height, '('+line[0])

@@ -529,7 +537,12 @@ class PDF(object):

                         self.canvas.drawRightString(left + 16.8 * cm, self.y - self.font_height, _formatPrice(part.sum))

                         self.y -= self.line_height

                         summaries = []

-                        if list(part.vat.keys())[0] == 0.0:

+                        if len(part.vat) == 1 and Decimal("0.0") in part.vat:

+                            vat = list(part.vat.values())[0]

+                            if self.invoice.vat_type == VAT_INNERGEM:

+                                self.canvas.drawString(left, self.y - self.font_height,

+                                                       'Innergemeinschaftliche Lieferung ohne USt.')

+                            else:

                                 self.canvas.drawString(left, self.y - self.font_height,

                                                        'Dieser Beleg wurde ohne Ausweis von MwSt erstellt.')

                             self.y -= self.line_height

@@ -538,17 +551,17 @@ class PDF(object):

                                 vat = list(part.vat.keys())[0]

                                 summaries.append(('zzgl. %.1f%% MwSt:' % (vat * 100), _formatPrice(vat * part.sum)))

                             else:

-                                for vat, vatdata in part.vat.items():

-                                    summaries.append(('zzgl. %.1f%% MwSt (%s):' % (vat * 100, vatdata[1]),

-                                                      _formatPrice(vat * vatdata[0])))

+                                for vat in part.vat.values():

+                                    summaries.append(('zzgl. %.1f%% MwSt (%s):' % (vat['vat'] * 100, vat['char']),

+                                                      _formatPrice(vat['vat_amount'])))

                         summaries.sort()

                         for line in summaries:

                             self.canvas.drawRightString(left + 14.5 * cm, self.y - self.font_height, line[0])

                             self.canvas.drawRightString(left + 16.8 * cm, self.y - self.font_height, line[1])

                             self.y -= self.line_height

                         sum = Decimal('0.0')

-                        for vat, vatdata in part.vat.items():

-                            sum += (vat + 1) * vatdata[0]

+                        for vat in part.vat.values():

+                            sum += vat['gross']

                         self.canvas.setFont(self.font + '-Bold', font_size)

                         if self.invoice.tender:

                             self.canvas.drawRightString(left + 14.5 * cm, self.y - self.font_height, 'Gesamtbetrag:')

@@ -578,8 +591,8 @@ class PDF(object):

                     sum = part.sum

                     if part.vatType == 'net':

                         sum = Decimal('0.0')

-                        for vat, vatdata in part.vat.items():

-                            sum += (vat + 1) * vatdata[0]

+                        for vatdata in part.vat.values():

+                            sum += vatdata['gross']

                     rest = sum - paysum

                     if part.payments and rest > 0:

                         self.canvas.setFont(self.font + '-Bold', font_size)

@@ -98,7 +98,7 @@ def InvoiceTableToText(invoiceTable: InvoiceTable):

         else:

             subject = _breakLine(el['subject'], width=41)

             ret.append(u'%5.2f %-3s %-37s  %10s %s %10s' % (

-                el['count'], unit, subject[0], _formatPrice(el['price']), invoiceTable.vat[el['vat']][1],

+                el['count'], unit, subject[0], _formatPrice(el['price']), invoiceTable.vat[el['vat']]['char'],

                 _formatPrice(el['total'])))

             for i in range(1, len(subject)):

                 ret.append(u'          %s' % subject[i])

@@ -122,13 +122,13 @@ def InvoiceTableToText(invoiceTable: InvoiceTable):

         ret.append('')

         summaries = []

         if len(invoiceTable.vat) == 1:

-            vat = list(invoiceTable.vat.keys())[0]

+            vat = list(invoiceTable.vat.values())[0]

             summaries.append(u'      Im Rechnungsbetrag sind %.1f%% MwSt enthalten (%s)' % (

-                vat * 100, _formatPrice((invoiceTable.sum / (vat + 1)) * vat)))

+                vat['vat'] * 100, _formatPrice(vat['vat_amount'])))

         else:

-            for vat, vatdata in list(invoiceTable.vat.items()):

+            for vat in invoiceTable.vat.values():

                 summaries.append(u'    %s: Im Teilbetrag von %s sind %.1f%% MwSt enthalten (%s)' % (

-                    vatdata[1], _formatPrice(vatdata[0]), vat * 100, _formatPrice((vatdata[0] / (vat + 1)) * vat)))

+                    vat['char'], _formatPrice(vat['gross']), vat['vat'] * 100, _formatPrice(vat['vat_amount'])))

         summaries.sort()

         for line in summaries:

             ret.append(line)

@@ -136,19 +136,19 @@ def InvoiceTableToText(invoiceTable: InvoiceTable):

         ret.append((u'Nettobetrag: %11s' % _formatPrice(invoiceTable.sum)).rjust(72))

         summaries = []

         if len(invoiceTable.vat) == 1:

-            vat = list(invoiceTable.vat.keys())[0]

-            summaries.append((u'zzgl. %.1f%% MwSt: %11s' % (vat * 100, _formatPrice(vat * invoiceTable.sum))).rjust(72))

+            vat = list(invoiceTable.vat.values())[0]

+            summaries.append((u'zzgl. %.1f%% MwSt: %11s' % (vat['vat'] * 100, _formatPrice(vat['vat_amount']))).rjust(72))

         elif len(invoiceTable.vat) > 1:

-            for vat, vatdata in list(invoiceTable.vat.items()):

+            for vat in invoiceTable.vat.values():

                 summaries.append(

-                    (u'zzgl. %4.1f%% MwSt (%s): %11s' % (vat * 100, vatdata[1], _formatPrice(vat * vatdata[0]))).rjust(

+                    (u'zzgl. %4.1f%% MwSt (%s): %11s' % (vat['vat'] * 100, vat['char'], _formatPrice(vat['vat_amount']))).rjust(

                         72))

         summaries.sort()

         for line in summaries:

             ret.append(line)

         tablesum = invoiceTable.sum

-        for vat, vatdata in list(invoiceTable.vat.items()):

-            tablesum += vat * vatdata[0]

+        for vat in invoiceTable.vat.values():

+            tablesum += vat['vat_amount']

         ret.append((u'Rechnungsbetrag: %11s' % _formatPrice(tablesum)).rjust(72))

     ret.append('')

     return '\n'.join(ret)

@@ -246,14 +246,10 @@ def InvoiceToXML(invoice):

             for vat, vatdata in part.vat.items():

                 trade_tax = ApplicableTradeTax()

                 # Steuerbetrag dieses Steuersatzes

-                amount = vatdata[0] * vat

-                if part.vatType == 'gross':

-                    amount = (vatdata[0] / (vat + 1)) * vat

+                amount = vatdata['vat_amount']

                 trade_tax.calculated_amount = Decimal(f"{amount:.2f}")

                 # Nettosumme dieses Steuersatzes

-                amount = vatdata[0]

-                if part.vatType == 'gross':

-                    amount = amount / (1 + vat)

+                amount = vatdata['net']

                 trade_tax.basis_amount = Decimal(f"{amount:.2f}")

                 trade_tax.type_code = "VAT"

                 if invoice.vat_type == VAT_REGULAR:

@@ -263,11 +259,10 @@ def InvoiceToXML(invoice):

                     trade_tax.exemption_reason = 'Als Kleinunternehmer wird gemäß §19 UStG keine USt in Rechnung gestellt.'

                 elif invoice.vat_type == VAT_INNERGEM:

                     trade_tax.category_code = "K"

+                    trade_tax.exemption_reason_code = 'vatex-eu-ic'

+                    trade_tax.exemption_reason = 'Innergemeinschaftliche Lieferung ohne Berechnung von Umsatzsteuer.'

                 trade_tax.rate_applicable_percent = Decimal(f"{vat * 100:.1f}")

-                if part.vatType == 'gross':

-                    summe_ust += (vatdata[0] / (vat + 1)) * vat

-                else:

-                    summe_ust += vatdata[0] * vat

+                summe_ust += vatdata['vat_amount']

                 doc.trade.settlement.trade_tax.add(trade_tax)

     for paragraph in textparts:

@@ -12,7 +12,7 @@ import qrcode

 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))

 from Invoice.InvoiceObjects import Invoice, RECHNUNG, InvoiceText, InvoiceTable, KORREKTUR, PAYMENT_LASTSCHRIFT, \

-    InvoiceImage

+    InvoiceImage, VAT_INNERGEM

 from Invoice.InvoiceToPDF import InvoiceToPDF, find_font_file

 from Invoice.InvoiceToText import InvoiceToText

 from Invoice.InvoiceToZUGFeRD import InvoiceToXML, attach_xml

@@ -17,13 +17,13 @@ data = {

  'data': ({'anzahl': Decimal('12.00'),

            'beschreibung': 'Testposten',

            'betrag': Decimal('8'),

-           'brutto': 1,

+           'brutto': 0,

            'datum': datetime.date(2023, 9, 20),

            'einheit': 'Stk',

            'enddatum': None,

            'info_headline': None,

            'info_text': None,

-           'mwst': 19.0},),

+           'mwst': Decimal('19.0')},),

  'daten': {'kuendigung': datetime.date(2024, 2, 16),

            'kunde': 5,

            'naechster_kuendigungstermin': datetime.date(2024, 3, 1),