invoice.git

@@ -1,20 +1,4 @@

 # -* coding: utf8 *-

-# (C) 2011 by Bernd Wurst <bernd@schokokeks.org>

-

-# This file is part of Bib2011.

-#

-# Bib2011 is free software: you can redistribute it and/or modify

-# it under the terms of the GNU General Public License as published by

-# the Free Software Foundation, either version 3 of the License, or

-# (at your option) any later version.

-#

-# Bib2011 is distributed in the hope that it will be useful,

-# but WITHOUT ANY WARRANTY; without even the implied warranty of

-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-# GNU General Public License for more details.

-#

-# You should have received a copy of the GNU General Public License

-# along with Bib2011.  If not, see <http://www.gnu.org/licenses/>.

 import datetime

@@ -1,43 +1,15 @@

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

-# (C) 2011 by Bernd Wurst <bernd@schokokeks.org>

-

-# This file is part of Bib2011.

-#

-# Bib2011 is free software: you can redistribute it and/or modify

-# it under the terms of the GNU General Public License as published by

-# the Free Software Foundation, either version 3 of the License, or

-# (at your option) any later version.

-#

-# Bib2011 is distributed in the hope that it will be useful,

-# but WITHOUT ANY WARRANTY; without even the implied warranty of

-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-# GNU General Public License for more details.

-#

-# You should have received a copy of the GNU General Public License

-# along with Bib2011.  If not, see <http://www.gnu.org/licenses/>.

 import os.path

-import re

 from reportlab.lib.pagesizes import A4

-# reportlab imports

 from reportlab.lib.units import cm, inch

 from reportlab.pdfbase import pdfmetrics

 from reportlab.pdfbase.ttfonts import TTFont, TTFError

 from reportlab.pdfgen import canvas

 from .InvoiceObjects import InvoiceTable, InvoiceText, InvoiceImage, GUTSCHRIFT

-

-

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

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

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

-    s = ("%.2f" % price).replace('.', ',')

-    pat = re.compile(r'([0-9])([0-9]{3}[.,])')

-    while pat.search(s):

-        s = pat.sub(r'\1.\2', s)

-    return s + ' ' + symbol

-

+from . import _formatPrice

 def find_font_file(filename):

     for n in range(4):

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

 from __future__ import division

-from utils import format_price, split_to_width

+from . import _formatPrice, split_to_width

 from .InvoiceObjects import Invoice, InvoiceTable, InvoiceText, InvoiceImage, PAYMENT_UEBERWEISUNG

@@ -85,14 +85,14 @@ def InvoiceTableToText(invoiceTable: InvoiceTable):

         if len(invoiceTable.vat) < 2:

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

             ret.append(u'%5.2f %-3s %-39s  %10s %10s' % (

-                el['count'], unit, subject[0], format_price(el['price']), format_price(el['total'])))

+                el['count'], unit, subject[0], _formatPrice(el['price']), _formatPrice(el['total'])))

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

                 ret.append(u'          %s' % subject[i])

         else:

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

             ret.append(u'%5.2f %-3s %-37s  %10s %s %10s' % (

-                el['count'], unit, subject[0], format_price(el['price']), invoiceTable.vat[el['vat']][1],

-                format_price(el['total'])))

+                el['count'], unit, subject[0], _formatPrice(el['price']), invoiceTable.vat[el['vat']][1],

+                _formatPrice(el['total'])))

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

                 ret.append(u'          %s' % subject[i])

         if 'period_start' in el and el['period_start']:

@@ -111,30 +111,30 @@ def InvoiceTableToText(invoiceTable: InvoiceTable):

                 ret.append(u'          %s' % line)

     ret.append('-' * 72)

     if invoiceTable.vatType == 'gross':

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

+        ret.append((u'Rechnungsbetrag:  %11s' % _formatPrice(invoiceTable.sum)).rjust(72))

         ret.append('')

         summaries = []

         if len(invoiceTable.vat) == 1:

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

             summaries.append(u'      Im Rechnungsbetrag sind %.1f%% MwSt enthalten (%s)' % (

-                vat * 100, format_price((invoiceTable.sum / (vat + 1)) * vat)))

+                vat * 100, _formatPrice((invoiceTable.sum / (vat + 1)) * vat)))

         else:

             for vat, vatdata in list(invoiceTable.vat.items()):

                 summaries.append(u'    %s: Im Teilbetrag von %s sind %.1f%% MwSt enthalten (%s)' % (

-                    vatdata[1], format_price(vatdata[0]), vat * 100, format_price((vatdata[0] / (vat + 1)) * vat)))

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

         summaries.sort()

         for line in summaries:

             ret.append(line)

     else:

-        ret.append((u'Nettobetrag: %11s' % format_price(invoiceTable.sum)).rjust(72))

+        ret.append((u'Nettobetrag: %11s' % _formatPrice(invoiceTable.sum)).rjust(72))

         summaries = []

         if len(invoiceTable.vat) == 1:

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

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

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

         elif len(invoiceTable.vat) > 1:

             for vat, vatdata in list(invoiceTable.vat.items()):

                 summaries.append(

-                    (u'zzgl. %4.1f%% MwSt (%s): %11s' % (vat * 100, vatdata[1], format_price(vat * vatdata[0]))).rjust(

+                    (u'zzgl. %4.1f%% MwSt (%s): %11s' % (vat * 100, vatdata[1], _formatPrice(vat * vatdata[0]))).rjust(

                         72))

         summaries.sort()

         for line in summaries:

@@ -142,7 +142,7 @@ def InvoiceTableToText(invoiceTable: InvoiceTable):

         tablesum = invoiceTable.sum

         for vat, vatdata in list(invoiceTable.vat.items()):

             tablesum += vat * vatdata[0]

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

+        ret.append((u'Rechnungsbetrag: %11s' % _formatPrice(tablesum)).rjust(72))

     ret.append('')

     return '\n'.join(ret)

@@ -1,20 +1,4 @@

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

-# (C) 2011 by Bernd Wurst <bernd@schokokeks.org>

-

-# This file is part of Bib2011.

-#

-# Bib2011 is free software: you can redistribute it and/or modify

-# it under the terms of the GNU General Public License as published by

-# the Free Software Foundation, either version 3 of the License, or

-# (at your option) any later version.

-#

-# Bib2011 is distributed in the hope that it will be useful,

-# but WITHOUT ANY WARRANTY; without even the implied warranty of

-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-# GNU General Public License for more details.

-#

-# You should have received a copy of the GNU General Public License

-# along with Bib2011.  If not, see <http://www.gnu.org/licenses/>.

 import os.path

 import sys

@@ -0,0 +1,26 @@

+

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

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

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

+    s = ("%.2f" % price).replace('.', ',')

+    pat = re.compile(r'([0-9])([0-9]{3}[.,])')

+    while pat.search(s):

+        s = pat.sub(r'\1.\2', s)

+    return s + ' ' + symbol

+

+

+def split_to_width(s, length):

+    '''Fügt zeilenumbrüche in einen String ein, dass er maximal 'length' Zeichen lang ist'''

+    orig = s

+    ret = []

+    while len(s) > 0:

+        if len(s) < length:

+            ret.append(s)

+            s = ''

+        else:

+            index = s.rfind(' ', 0, length)

+            if index == -1:

+                index = length

+            ret.append(s[:index])

+            s = s[index + 1:]

+    return ret