invoice.git

@@ -374,14 +374,6 @@ def InvoiceToPDF(iv, bankdata=True):

       if part.summary:

         y -= (0.3*cm)

         if part.vatType == 'gross':

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

-          if iv.tender:

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

-          else:

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

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

-          canvas.setFont(font, font_size)

-          y -= line_height + line_padding

           summaries = []

           if len(part.vat) == 1:

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

@@ -389,23 +381,33 @@ def InvoiceToPDF(iv, bankdata=True):

             vatstr = '%s' % integer

             if decimals:

               vatstr += ',%s' % decimals

-            if iv.tender:

-              summaries.append(('Im Gesamtbetrag sind %s%% MwSt enthalten:' % vatstr, _formatPrice((part.sum/(vat+1))*vat)))

-            else:

-              summaries.append(('Im Rechnungsbetrag sind %s%% MwSt enthalten:' % vatstr, _formatPrice((part.sum/(vat+1))*vat)))

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

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

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

+            y -= line_height

+            summaries.append(('%s%% MwSt:' % vatstr, _formatPrice((part.sum/(vat+1))*vat)))

           else:

+            net = 0.0

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

               (integer, decimals) = _niceCount( (vat * 100) )

               vatstr = '%s' % integer

               if decimals:

                 vatstr += ',%s' % decimals

-              summaries.append(('%s: Im Teilbetrag von %s sind %s%% MwSt enthalten:' % (vatdata[1], _formatPrice(vatdata[0]), vatstr), _formatPrice((vatdata[0]/(vat+1))*vat)))

+              summaries.append(('%s: Teilbetrag %s zzgl. %s%% MwSt:' % (vatdata[1], _formatPrice(vatdata[0]), vatstr), _formatPrice((vatdata[0]/(vat+1))*vat)))

+              net += vatdata[0]

+            summaries.append(('Nettobetrag gesamt:', _formatPrice(net)))

           summaries.sort()

           for line in summaries:

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

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

             y -= line_height

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

+          if iv.tender:

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

+          else:

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

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

+          canvas.setFont(font, font_size)

+          y -= line_height + line_padding

         else:

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

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