invoice.git

@@ -13,6 +13,9 @@ from reportlab.lib.units import cm

 from reportlab.pdfgen import canvas as Canvas

+num_pages = 1

+

+

 def _formatPrice(price, symbol='€'):

   '''_formatPrice(price, symbol='€'):

   Gets a floating point value and returns a formatted price, suffixed by 'symbol'. '''

@@ -80,12 +83,6 @@ def _drawJustifiedString(x, y, text, canvas, width, font, size):

   return

-def _PageWrap(canvas):

-  '''Seitenumbruch'''

-  canvas.showPage()

-  basicPage(canvas)

-

-

 def address(canvas, lines):

   x = 2.0 * cm

   y = page_height - 5.0*cm

@@ -97,20 +94,25 @@ def address(canvas, lines):

   line_height = 11 + 0.1*cm

   y -= line_height

-  canvas.setFont(font, 11)

-  for line in lines:

+

   fontsize = 11

+  for line in lines:

     if canvas.stringWidth(line, font, fontsize) > address_width:

       # Wenn es in zwei Zeilen passt, dann ist alles okay, ansonsten verkleinern

-      if canvas.stringWidth(line, font, fontsize) > 2*address_width:

-        for fontsize in [10.5, 10, 9.5, 9, 8.5]:

-          if canvas.stringWidth(line, font, fontsize) <= 2*address_width:

+      if len(lines) > 4 or canvas.stringWidth(line, font, fontsize) > 2*address_width:

+        for candidate in [10.5, 10, 9.5, 9, 8.5, 8]:

+	  fontsize = candidate

+          if (len(lines) <= 4 and canvas.stringWidth(line, font, fontsize) <= 2*address_width) or canvas.stringWidth(line, font, fontsize) <= address_width:

             break

+  for line in lines:

+    if canvas.stringWidth(line, font, fontsize) > address_width:

       mylines = _splitToWidth(canvas, line, address_width, font, fontsize)

       for l in mylines:

+  	canvas.setFont(font, fontsize)

         canvas.drawString(x+0.5*cm, y, l)

         y -= line_height

     else:

+      canvas.setFont(font, fontsize)

       canvas.drawString(x+0.5*cm, y, line)

       y -= line_height

@@ -129,7 +131,6 @@ def InvoiceToPDF(iv):

   canvas.setFont(font, 12)

-  num_pages = 1

   # Waehrungssysmbol

   symbol = '€'

@@ -156,7 +157,8 @@ def InvoiceToPDF(iv):

     elif type(part) == Invoice.Table:

       # Eine Zeile plus 2 mal line_padding für Tabellenkopf

       height = line_height + 2 * line_padding

-      for el in part.entries:

+      # Wenn nur ein Element (plus Summen) hin passt, reicht uns das

+      el = part.entries[0]

       # Die Abstände oben und unten

       height += 2 * line_padding

       # Die Breite ist konservativ

@@ -173,6 +175,33 @@ def InvoiceToPDF(iv):

     return height

+  def _tableHead(y):

+    canvas.setFont(font, font_size)

+    canvas.drawString(left+(0.1*cm), y-line_height+line_padding, 'Anz.')

+    canvas.drawString(left+(2.6*cm), y-line_height+line_padding, 'Beschreibung')

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

+      canvas.drawRightString(left+(14.3*cm), y-line_height+line_padding, 'Einzelpreis')

+    else:

+      canvas.drawRightString(left+(13.7*cm), y-line_height+line_padding, 'Einzelpreis')

+    canvas.drawRightString(left+(16.8*cm), y-line_height+line_padding, 'Gesamtpreis')

+    canvas.setLineWidth(0.01*cm)

+    canvas.line(left, y - line_height, right, y - line_height)

+    y -= line_height + 0.02*cm

+    return y

+   

+  def _PageWrap(canvas):

+    '''Seitenumbruch'''

+    global num_pages

+    num_pages += 1

+    canvas.setFont(font, default_font_size-2)

+    canvas.drawRightString(rightcontent, bottomcontent + line_padding, 'Fortsetzung auf Seite %i' % num_pages)

+    canvas.showPage()

+    basicPage(canvas)

+    y = topcontent - font_size

+    canvas.setFillColor((0,0,0))

+    canvas.setFont(font, font_size-2)

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

+

   address(canvas, iv.addresslines)

@@ -230,16 +258,8 @@ def InvoiceToPDF(iv):

   font_size = default_font_size

   for part in iv.parts:

     if y - _partHeight(part) < (bottomcontent + (0.5*cm)):

-      num_pages += 1

-      y = bottomcontent + (0.5*cm)

-      canvas.setFont(font, default_font_size-2)

-      canvas.drawRightString(rightcontent, bottomcontent + line_padding, 'Fortsetzung auf Seite %i' % num_pages)

       _PageWrap(canvas)

-      y = topcontent - font_size

-      canvas.setFillColor((0,0,0))

-      canvas.setFont(font, font_size-2)

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

-      y -= line_padding*3

+      y = topcontent - font_size - line_padding*3

     # Debug: Was hat die Höhenbestimmung für diesen Teil als Höhe herausgefunden?

     #canvas.line(leftcontent, y-_partHeight(part), rightcontent, y-_partHeight(part))

@@ -249,17 +269,8 @@ def InvoiceToPDF(iv):

       right = rightcontent

       top = topcontent

       bottom = bottomcontent

-      canvas.setFont(font, font_size)

-      canvas.drawString(left+(0.1*cm), y-line_height+line_padding, 'Anz.')

-      canvas.drawString(left+(1.6*cm), y-line_height+line_padding, 'Beschreibung')

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

-        canvas.drawRightString(left+(14.3*cm), y-line_height+line_padding, 'Einzelpreis')

-      else:

-        canvas.drawRightString(left+(13.7*cm), y-line_height+line_padding, 'Einzelpreis')

-      canvas.drawRightString(left+(16.8*cm), y-line_height+line_padding, 'Gesamtpreis')

-      canvas.setLineWidth(0.01*cm)

-      canvas.line(left, y - line_height, right, y - line_height)

-      y -= line_height + 0.02*cm

+      temp_sum = 0.0

+      y = _tableHead(y)

       odd=True

       for el in part.entries:

         subject = []

@@ -270,22 +281,48 @@ def InvoiceToPDF(iv):

         desc = []

         if 'desc' in el and el['desc'] != '':

           desc = _splitToWidth(canvas, el['desc'], 11*cm, font, font_size)

+        need_lines = len(subject) + len(desc)

+

+	# need page wrap?

+      	if y - (need_lines+2 * font_size) < (bottomcontent + 2*cm):

+          canvas.setFont(font, font_size)

+	  # Zwischensumme

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

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

+	  # page wrap

+	  _PageWrap(canvas)

+          y = topcontent - font_size - line_padding*3

+	  # header

+	  y = _tableHead(y)

+          odd=True

+	  # übertrag

+          canvas.setFont(font, font_size)

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

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

+	  y -= font_height + line_padding

+	# Zwischensumme (inkl. aktueller Posten)

+        temp_sum += el['total']

         # draw the background

         if not odd:

           canvas.setFillColorRGB(0.9, 0.9, 0.9)

         else:

           canvas.setFillColorRGB(1, 1, 1)

-        need_lines = len(subject) + len(desc)

         canvas.rect(left, y - (need_lines*line_height)-(2*line_padding), height = (need_lines*line_height)+(2*line_padding), width = right-left, fill=1, stroke=0)

         canvas.setFillColorRGB(0, 0, 0)

         y -= line_padding

         (integer, decimals) = _niceCount(el['count'])

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

+	suffix = ''

 	if decimals:

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

+	  suffix = ',%s' % decimals

+	if el['unit']:

+	  suffix = suffix + ' ' + el['unit']

+        if suffix:

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

+	  

         if len(part.vat) < 2:

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

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

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

           if el['tender']:  

             canvas.drawRightString(left+16.8*cm, y-font_height, 'eventual')

@@ -294,15 +331,15 @@ def InvoiceToPDF(iv):

           subject = subject[1:]

           x = 1

           for line in subject:

-            canvas.drawString(left+1.7*cm, y-(x * line_height)-font_height, line)

+            canvas.drawString(left+2.7*cm, y-(x * line_height)-font_height, line)

             x += 1

           for line in desc[:-1]:

-            _drawJustifiedString(left+1.7*cm, y-(x * line_height)-font_height, line, canvas, 11*cm, font, font_size)

+            _drawJustifiedString(left+2.7*cm, y-(x * line_height)-font_height, line, canvas, 11*cm, font, font_size)

             x += 1

-          canvas.drawString(left+1.7*cm, y-(x * line_height)-font_height, desc[-1])

+          canvas.drawString(left+2.7*cm, y-(x * line_height)-font_height, desc[-1])

           x += 1

         else:

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

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

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

           canvas.drawString(left+13.7*cm, y-font_height, str(part.vat[el['vat']][1]))

           if el['tender']:  

@@ -312,10 +349,10 @@ def InvoiceToPDF(iv):

           subject = subject[1:]

           x = 1

           for line in subject:

-            canvas.drawString(left+1.7*cm, y-(x * line_height)-font_height, line)

+            canvas.drawString(left+2.7*cm, y-(x * line_height)-font_height, line)

             x += 1

           for line in desc:

-            canvas.drawString(left+1.7*cm, y-(x * line_height)-font_height, line)

+            canvas.drawString(left+2.7*cm, y-(x * line_height)-font_height, line)

             x += 1

         odd = not odd

         y -= (need_lines * line_height) + line_padding