invoice.git

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

 # -* coding: utf8 *-

-from Invoice import *

+import Invoice

 import re

 # reportlab imports

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

   def _partHeight(part):

     height = 0

-    if type(part) == Text:

+    if type(part) == Invoice.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) == Table:

+    elif type(part) == Invoice.Table:

       ## FIXME: Das ist dreckig

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

       height += 3*cm

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

   canvas.setFont(font, font_size)

-  canvas.drawString(x, y+0.1*cm, ' schokokeks.org - Köchersberg 25 - 71540 Murrhardt')

+  canvas.drawString(x, y+0.1*cm, ' schokokeks.org · Köchersberg 25 · 71540 Murrhardt')

   canvas.line(x, y, x + (8.5 * cm), y)

   y = y - font_size - 3

@@ -196,18 +196,22 @@ def InvoiceToPDF(iv):

   y -= (font_size + 10)

   y = -9.5*cm

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

-  if iv.tender:

-    canvas.drawString(leftcontent, y, 'Angebot')

-  else:

-    canvas.drawString(leftcontent, y, 'Rechnung')

+  min_y = y

+  if iv.caption:

+    canvas.drawString(leftcontent, y, iv.caption)

+    min_y -= (font_size + 3) + 0.5*cm

-  if iv.tender:

+  if type(iv) == Invoice.Tender:

     canvas.setFont(font, font_size)

     canvas.drawString(rightcolumn, y, "Erstellungsdatum:")

     canvas.drawRightString(rightcontent, y, "%s" % iv.date.strftime('%d. %m. %Y'))

     y -= (font_size + 0.1*cm)

-    

-  else:

+  elif type(iv) == Invoice.Generic:

+    canvas.setFont(font, font_size)

+    canvas.drawString(rightcolumn, y, "Datum:")

+    canvas.drawRightString(rightcontent, y, "%s" % iv.date.strftime('%d. %m. %Y'))

+    y -= (font_size + 0.1*cm)

+  elif type(iv) == Invoice.Invoice:

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

     canvas.drawString(rightcolumn, y, "Bei Fragen bitte immer angeben:")

     y -= (font_size + 0.2*cm)

@@ -223,11 +227,14 @@ def InvoiceToPDF(iv):

     canvas.drawRightString(rightcontent, y, "%s" % iv.customerno)

     y -= (font_size + 0.5*cm)

   canvas.setFont(font, font_size)

+  y = min(min_y, y)

+  if iv.salutation:

     canvas.drawString(leftcontent, y, iv.salutation)

     y -= font_size + 0.2*cm

+    if type(iv) in [Invoice.Tender, Invoice.Invoice]:

       introText = 'hiermit stellen wir Ihnen die nachfolgend genannten Leistungen in Rechnung.'

-  if iv.tender:

+      if type(iv) == Invoice.Tender:

         introText = 'hiermit unterbreiten wir Ihnen folgendes Angebot.'

       intro = _splitToWidth(canvas, introText, rightcontent - leftcontent, font, font_size)

       for line in intro:

@@ -250,7 +257,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) == Table:

+    if type(part) == Invoice.Table:

       left = leftcontent

       right = rightcontent

@@ -377,7 +384,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) == Text:

+    elif type(part) == Invoice.Text:

       my_font_size = font_size

       canvas.setFont(font, my_font_size)

       left, right = leftcontent, rightcontent