invoice.git

@@ -2,7 +2,7 @@

 import datetime

-class InvoiceText(object):

+class Text(object):

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

     self.paragraphs = [content]

     self.urgent = urgent

@@ -12,7 +12,7 @@ class InvoiceText(object):

     self.paragraphs.append(content)

-class InvoiceTable(object):

+class Table(object):

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

     self.entries = []

     self.vat = {}

@@ -58,12 +58,14 @@ class InvoiceTable(object):

 class Invoice(object):

-  def __init__(self, tender = False):

+  tender = False

+  caption = 'Rechnung'

+

+  def __init__(self):

     self.customerno = None

     self.addresslines = ['', ]

     self.salutation = 'Sehr geehte Damen und Herren,'

     self.id = None

-    self.tender = tender

     self.parts = []

     self.pagecount = 0

     self.date = datetime.date.today()

@@ -72,3 +74,14 @@ class Invoice(object):

     if type(date) != datetime.date:

       raise ValueError('date must be of type »datetime.date«')

     self.date = date

+

+

+class Tender(Invoice):

+  tender = True

+  caption = 'Angebot'

+

+

+class Generic(Invoice):

+  tender = False

+  caption = ''

+

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

 # -* coding: utf8 *-

-from InvoiceObjects import *

+from Invoice import *

 import re

 # reportlab imports

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

   def _partHeight(part):

     height = 0

-    if type(part) == InvoiceText:

+    if type(part) == Text:

       left, right = leftcontent, rightcontent

       if part.urgent:

         left += 1.5*cm

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

         height += (len(_splitToWidth(canvas, part.headline, right-left, font+'-Bold', default_font_size+1)) * line_height) + line_padding

       for para in part.paragraphs:  

         height += (len(_splitToWidth(canvas, para, right-left, font, default_font_size)) * line_height) + line_padding

-    elif type(part) == InvoiceTable:

+    elif type(part) == Table:

       ## FIXME: Das ist dreckig

       height = len(part.entries) * 1.1*cm

       height += 3*cm

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

       canvas.setFont(font, font_size-2)

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

       y -= line_padding*3

-    if type(part) == InvoiceTable:

+    if type(part) == Table:

       left = leftcontent

       right = rightcontent

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

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

           canvas.setFont(font, font_size)

           y -= line_height + line_padding

-    elif type(part) == InvoiceText:

+    elif type(part) == Text:

       my_font_size = font_size

       canvas.setFont(font, my_font_size)

       left, right = leftcontent, rightcontent

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

 # -* coding: utf8 *-

-from InvoiceObjects import *

+from Invoice import Text, Table

 from utils import format_price, split_to_width

@@ -31,9 +31,9 @@ def InvoiceToText(iv):

   ret.append('')

   for part in iv.parts:

-    if type(part) == InvoiceTable:

+    if type(part) == Table:

       ret.append(InvoiceTableToText(part))

-    elif type(part) == InvoiceText:

+    elif type(part) == Text:

       ret.append(InvoiceTextToText(part))

     else:

       raise NotImplementedError("Cannot handle part of type %s" % type(part))