invoice.git

@@ -48,10 +48,12 @@ class Table(object):

     '''Fügt eine Zeile ein. data muss ein Dict mit passenden Keys und passenden

     Typen sein'''

     d = self.validEntry(data)

+    if d['vat'] != 0:

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

         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']

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

       self.sum += d['total']

     self.entries.append(d)

@@ -284,7 +284,7 @@ def InvoiceToPDF(iv):

         canvas.drawRightString(left+0.8*cm, y-font_height, integer)

         if decimals:

           canvas.drawString(left+0.8*cm, y-font_height, ',%s' % decimals)

-        if len(part.vat) == 1:

+        if len(part.vat) < 2:

           canvas.drawString(left+1.7*cm, y-font_height, subject[0])

           canvas.drawRightString(left+14.3*cm, y-font_height, _formatPrice(el['price']))

           if el['tender']:  

@@ -365,7 +365,7 @@ def InvoiceToPDF(iv):

             if decimals:

               vatstr += ',%s' % decimals

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

-          else:

+          elif len(part.vat) > 1:

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

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

               vatstr = '%s' % integer

@@ -377,9 +377,9 @@ def InvoiceToPDF(iv):

             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

-          sum = 0

+          sum = part.sum

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

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

+            sum += vat*vatdata[0]

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

           if iv.tender:

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

@@ -49,7 +49,7 @@ def InvoiceToText(iv):

 def InvoiceTableToText(invoiceTable):

   ret = []

-  if len(invoiceTable.vat) == 1:

+  if len(invoiceTable.vat) < 2:

     ret.append(u'Anz   Beschreibung                                      Preis     Gesamt')

     ret.append(u'-'*72)

   else:

@@ -57,7 +57,7 @@ def InvoiceTableToText(invoiceTable):

     ret.append(u'-'*72)

   for el in invoiceTable.entries:

-    if len(invoiceTable.vat) == 1:

+    if len(invoiceTable.vat) < 2:

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

       ret.append(u'%5.2f %-43s  %10s %10s' % (el['count'], subject[0], format_price(el['price']), format_price(el['total'])))

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

@@ -91,15 +91,15 @@ def InvoiceTableToText(invoiceTable):

     if len(invoiceTable.vat) == 1:

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

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

-    else:

+    elif len(invoiceTable.vat) > 1:

       for vat, vatdata in invoiceTable.vat.iteritems():

         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 = 0

+    sum = invoiceTable.sum

     for vat, vatdata in invoiceTable.vat.iteritems():

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

+      sum += vat*vatdata[0]

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

   ret.append('')

   return ('\n'.join(ret)).encode('utf-8')