invoice.git

@@ -1,7 +1,7 @@

 # -* coding: utf8 *-

 import datetime

-

+from decimal import Decimal

 class InvoiceImage(object):

     def __init__(self, pilimage, caption=None, dpi=80, alignment="left"):

@@ -27,7 +27,7 @@ class InvoiceTable(object):

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

         self.entries = []

         self.vat = {}

-        self.sum = 0.0

+        self.sum = Decimal('0.0')

         self.payments = []

         self.tender = tender

         self.summary = summary

@@ -47,14 +47,14 @@ class InvoiceTable(object):

                'count': e['count'],

                'unit': e['unit'],

                'subject': e['subject'],

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

-               'total': (e['price'] * e['count']),

-               'vat': e['vat'],

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

+               'total': Decimal(e['price'] * e['count']),

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

                'tender': False,

                'print_date': True,

                }

         if ret['vat'] > 1:

-            ret['vat'] = float(ret['vat']) / 100

+            ret['vat'] = Decimal(ret['vat'] / 100)

         if 'tender' in e.keys():

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

@@ -84,7 +84,7 @@ class InvoiceTable(object):

         self.entries.append({'type': 'title', 'title': title, })

     def addPayment(self, payment_type, amount, date):

-        self.payments.append({"type": payment_type, "amount": amount, "date": date})

+        self.payments.append({"type": payment_type, "amount": Decimal(amount), "date": date})

 RECHNUNG = 380

@@ -1,7 +1,7 @@

 # -*- coding: utf-8 -*-

 import os.path

-

+from decimal import Decimal

 from reportlab.lib.pagesizes import A4

 from reportlab.lib.units import cm, inch

 from reportlab.pdfbase import pdfmetrics

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

                 left = self.leftcontent

                 right = self.rightcontent

                 self._tableHead(part)

-                temp_sum = 0.0

+                temp_sum = Decimal('0.0')

                 odd = True

                 for el in part.entries:

                     if el['type'] == 'title':

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

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

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

                             summaries = []

-                            vat = 0.0

+                            vat = Decimal('0.0')

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

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

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

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

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

                                         else:

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

-                                                vatdata[1]), 0.0))

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

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

                             summaries.sort()

                             for line in summaries:

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

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

+                        sum = Decimal('0.0')

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

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

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

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

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

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

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

-                    paysum = 0.0

+                    paysum = Decimal('0.0')

                     for pay in part.payments:

                         paysum += pay['amount']

                         descr = 'Zahlung'

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

                         self.y -= self.line_height

                     sum = part.sum

                     if part.vatType == 'net':

-                        sum = 0

+                        sum = Decimal('0.0')

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

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

                     rest = sum - paysum

@@ -148,10 +148,10 @@ def InvoiceToXML(invoice):

         doc.trade.delivery.event.occurrence = deliverydate

     # Line Items

-    summe_netto = 0.0

-    summe_brutto = 0.0

-    summe_bezahlt = 0.0

-    summe_ust = 0.0

+    summe_netto = Decimal('0.0')

+    summe_brutto = Decimal('0.0')

+    summe_bezahlt = Decimal('0.0')

+    summe_ust = Decimal('0.0')

     line_id_count = 0

     textparts = []

     for part in invoice.parts: