invoice.git

@@ -27,11 +27,10 @@ class Table(object):

     '''bekommt einen Eintrag und liefert einen Eintrag wenn ok, wirft ansonsten ValueError.

     wird benutzt um z.B. die Summe auszurechnen oder ähnliches

     '''

-    k = entry.keys()

     e = entry

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

+    if not ('count' in e and 'subject' in e and 'price' in e and 'vat' in e):

       raise ValueError('Some data is missing!')

-    if not 'unit' in e.keys():

+    if not 'unit' in e:

       e['unit'] = None

     ret = {'count': e['count'],

            'unit': e['unit'],

@@ -41,9 +40,9 @@ class Table(object):

           'vat': e['vat'],

           'tender': False,

           }

-    if 'tender' in e.keys():

+    if 'tender' in e:

       ret['tender'] = e['tender']

-    if 'desc' in k:

+    if 'desc' in e:

       ret['desc'] = e['desc']

     return ret

@@ -52,7 +51,7 @@ class Table(object):

     Typen sein'''

     d = self.validEntry(data)

     if d['vat'] != 0:

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

+      if not d['vat'] in self.vat:

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

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

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

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

 # -* coding: utf8 *-

-from metrics import *

+from .metrics import *

 address_header = 'schokokeks.org · Köchersberg 32 · 71540 Murrhardt'

@@ -5,7 +5,7 @@ def setup():

   from reportlab.pdfbase.ttfonts import TTFont

   from reportlab.pdfbase import pdfmetrics

-  if 'DejaVuSans' not in pdfmetrics._fonts.keys():

+  if 'DejaVuSans' not in pdfmetrics._fonts:

     pdfmetrics.registerFont(TTFont("DejaVuSans", "DejaVuSans.ttf"))

     pdfmetrics.registerFont(TTFont("DejaVuSans-Bold", "DejaVuSans-Bold.ttf"))

     pdfmetrics.registerFont(TTFont("DejaVuSans-Oblique", "DejaVuSans-Oblique.ttf"))

@@ -4,9 +4,9 @@ import Invoice

 import re

 # our page size and margins

-from metrics import *

+from .metrics import *

 # our custom page style

-from custom_elements import basicPage, firstPage, address_header

+from .custom_elements import basicPage, firstPage, address_header

 # reportlab imports

 from reportlab.lib.units import cm

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

 def InvoiceToPDF(iv, bankdata=True):

+  try:

     from StringIO import StringIO

+  except ImportError:

+    from io import StringIO

   fd = StringIO()

   canvas = Canvas.Canvas(fd, pagesize=A4)

@@ -381,7 +384,7 @@ def InvoiceToPDF(iv, bankdata=True):

           y -= line_height + line_padding

           summaries = []

           if len(part.vat) == 1:

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

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

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

             vatstr = '%s' % integer

             if decimals:

@@ -392,7 +395,7 @@ def InvoiceToPDF(iv, bankdata=True):

               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)))

           else:

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

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

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

               vatstr = '%s' % integer

               if decimals:

@@ -409,14 +412,14 @@ def InvoiceToPDF(iv, bankdata=True):

           y -= line_height

           summaries = []

           if len(part.vat) == 1:

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

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

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

             vatstr = '%s' % integer

             if decimals:

               vatstr += ',%s' % decimals

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

           elif len(part.vat) > 1:

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

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

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

               vatstr = '%s' % integer

               if decimals:

@@ -428,7 +431,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.iteritems():

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

             sum += vat*vatdata[0]

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

           if iv.tender:

@@ -82,10 +82,10 @@ def InvoiceTableToText(invoiceTable):

     ret.append('')

     summaries = []

     if len(invoiceTable.vat) == 1:

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

+      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.iteritems():

+      for vat, vatdata in 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,16 +94,16 @@ def InvoiceTableToText(invoiceTable):

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

     summaries = []

     if len(invoiceTable.vat) == 1:

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

+      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.iteritems():

+      for vat, vatdata in 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.iteritems():

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

       sum += vat*vatdata[0]

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

   ret.append('')