invoice.git

@@ -3,7 +3,7 @@

 import datetime

-class Text(object):

+class Text:

     def __init__(self, content, urgent=False, headline=None):

         self.paragraphs = [content]

         self.urgent = urgent

@@ -13,7 +13,7 @@ class Text(object):

         self.paragraphs.append(content)

-class Table(object):

+class Table:

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

         self.entries = []

         self.vat = {}

@@ -61,7 +61,7 @@ class Table(object):

         self.entries.append(d)

-class Invoice(object):

+class Invoice:

     tender = False

     caption = 'Rechnung'

@@ -1,4 +1,5 @@

 # -* coding: utf8 *-

+from __future__ import division

 from .metrics import *

@@ -24,15 +25,15 @@ def Footer(canvas):

     canvas.drawString(leftcontent, bottomcontent - 30, 'www.schokokeks.org')

     canvas.drawString(leftcontent, bottomcontent - 40, 'root@schokokeks.org')

-    canvas.drawString(leftcontent + ((rightcontent - leftcontent) / 3), bottomcontent - 10, 'Steuernummer 51072/01109')

-    canvas.drawString(leftcontent + ((rightcontent - leftcontent) / 3), bottomcontent - 20, 'Finanzamt Backnang')

-    canvas.drawString(leftcontent + ((rightcontent - leftcontent) / 3), bottomcontent - 30, 'USt-ID: DE255720588')

+    canvas.drawString(leftcontent + ((rightcontent - leftcontent) // 3), bottomcontent - 10, 'Steuernummer 51072/01109')

+    canvas.drawString(leftcontent + ((rightcontent - leftcontent) // 3), bottomcontent - 20, 'Finanzamt Backnang')

+    canvas.drawString(leftcontent + ((rightcontent - leftcontent) // 3), bottomcontent - 30, 'USt-ID: DE255720588')

     canvas.setFont(font, 7)

-    canvas.drawString(leftcontent + ((rightcontent - leftcontent) / 3) * 2, bottomcontent - 10, 'Volksbank Backnang')

-    canvas.drawString(leftcontent + ((rightcontent - leftcontent) / 3) * 2, bottomcontent - 20, 'IBAN: DE91 6029 1120 0041 5120 06')

-    canvas.drawString(leftcontent + ((rightcontent - leftcontent) / 3) * 2, bottomcontent - 30, 'BIC: GENODES1VBK')

-    canvas.drawString(leftcontent + ((rightcontent - leftcontent) / 3) * 2, bottomcontent - 40, '(Kto: 41512 006 / BLZ: 602 911 20)')

+    canvas.drawString(leftcontent + ((rightcontent - leftcontent) // 3) * 2, bottomcontent - 10, 'Volksbank Backnang')

+    canvas.drawString(leftcontent + ((rightcontent - leftcontent) // 3) * 2, bottomcontent - 20, 'IBAN: DE91 6029 1120 0041 5120 06')

+    canvas.drawString(leftcontent + ((rightcontent - leftcontent) // 3) * 2, bottomcontent - 30, 'BIC: GENODES1VBK')

+    canvas.drawString(leftcontent + ((rightcontent - leftcontent) // 3) * 2, bottomcontent - 40, '(Kto: 41512 006 / BLZ: 602 911 20)')

 def basicPage(canvas):

@@ -1,5 +1,6 @@

 # -* coding: utf8 *-

+from __future__ import division

 import Invoice

 import re

@@ -74,7 +75,7 @@ def _drawJustifiedString(x, y, text, canvas, width, font, size):

         words_width += canvas.stringWidth(word, font, size)

     available_space = width - words_width

-    available_each = available_space / float((len(words) - 1))

+    available_each = available_space // float((len(words) - 1))

     my_x = x

     for idx in range(len(words)):

@@ -120,7 +121,7 @@ def address(canvas, lines):

 def InvoiceToPDF(iv, bankdata=True):

     try:

-        from StringIO import StringIO

+        from io import StringIO

     except ImportError:

         from io import StringIO

     fd = StringIO()

@@ -200,7 +201,7 @@ def InvoiceToPDF(iv, bankdata=True):

         y = topcontent - font_size

         canvas.setFillColor((0, 0, 0))

         canvas.setFont(font, font_size - 2)

-        canvas.drawCentredString(leftcontent + (rightcontent - leftcontent) / 2, y, '- Seite %i -' % num_pages)

+        canvas.drawCentredString(leftcontent + (rightcontent - leftcontent) // 2, y, '- Seite %i -' % num_pages)

     address(canvas, iv.addresslines)

@@ -209,10 +210,10 @@ def InvoiceToPDF(iv, bankdata=True):

     if not bankdata:

         # Bankdaten überschreiben wenn Lastschrift

         canvas.setFillColor(Color(255, 255, 255, alpha=0.8))

-        canvas.rect(leftcontent + ((rightcontent - leftcontent) / 3) * 2 - 2, bottomcontent - 2, (rightcontent - leftcontent) / 3, -40, fill=True, stroke=False)

+        canvas.rect(leftcontent + ((rightcontent - leftcontent) // 3) * 2 - 2, bottomcontent - 2, (rightcontent - leftcontent) // 3, -40, fill=True, stroke=False)

         canvas.setFillColor(Color(0, 0, 0, alpha=1))

         canvas.saveState()

-        canvas.translate(leftcontent + ((rightcontent - leftcontent) / 3) * 2 + 2, bottomcontent - 40)

+        canvas.translate(leftcontent + ((rightcontent - leftcontent) // 3) * 2 + 2, bottomcontent - 40)

         canvas.rotate(15)

         canvas.drawString(0, 0, "Bitte nicht überweisen")

         canvas.restoreState()

@@ -382,12 +383,12 @@ def InvoiceToPDF(iv, bankdata=True):

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

                     else:

                         net = 0.0

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

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

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

                             vatstr = '%s' % integer

                             if decimals:

                                 vatstr += ',%s' % decimals

-                            summaries.append(('%s: Teilbetrag %s zzgl. %s%% MwSt:' % (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()

@@ -416,7 +417,7 @@ def InvoiceToPDF(iv, bankdata=True):

                             vatstr += ',%s' % decimals

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

                     elif len(part.vat) > 1:

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

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

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

                             vatstr = '%s' % integer

                             if decimals:

@@ -428,7 +429,7 @@ def InvoiceToPDF(iv, bankdata=True):

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

                         y -= line_height

                     sum = part.sum

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

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

                         sum += vat * vatdata[0]

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

                     if iv.tender:

@@ -1,5 +1,6 @@

 # -* coding: utf8 *-

+from __future__ import division

 from Invoice import Text, Table

 from utils import format_price, split_to_width

@@ -82,7 +83,7 @@ def InvoiceTableToText(invoiceTable):

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

             summaries.append(u'      Im Rechnungsbetrag sind %.1f%% MwSt enthalten (%s)' % (vat * 100, format_price((invoiceTable.sum / (vat + 1)) * vat)))

         else:

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

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

                 summaries.append(u'    %s: Im Teilbetrag von %s sind %.1f%% MwSt enthalten (%s)' % (vatdata[1], format_price(vatdata[0]), vat * 100, format_price((vatdata[0] / (vat + 1)) * vat)))

         summaries.sort()

         for line in summaries:

@@ -94,13 +95,13 @@ def InvoiceTableToText(invoiceTable):

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

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

         elif len(invoiceTable.vat) > 1:

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

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

                 summaries.append((u'zzgl. %4.1f%% MwSt (%s): %11s' % (vat * 100, vatdata[1], format_price(vat * vatdata[0]))).rjust(72))

         summaries.sort()

         for line in summaries:

             ret.append(line)

         sum = invoiceTable.sum

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

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

             sum += vat * vatdata[0]

         ret.append((u'Rechnungsbetrag: %11s' % format_price(sum)).rjust(72))

     ret.append('')