invoice.git

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

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

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

             self.y -= (self.font_size + 0.1 * cm)

-        else:

+        elif self.invoice.type:

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

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

             self.y -= (self.font_size + 0.2 * cm)

@@ -316,6 +316,10 @@ class PDF(object):

             self.canvas.drawString(self.rightcolumn, self.y, "Rechnungsnummer:")

             self.canvas.drawRightString(self.rightcontent, self.y, "%s" % self.invoice.id)

             self.y -= (self.font_size + 0.1 * cm)

+        else:

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

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

+            self.y -= (self.font_size + 0.1 * cm)

         if self.invoice.customerno:

             self.canvas.drawString(self.rightcolumn, self.y, "Kundennummer:")

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

@@ -36,8 +36,12 @@ def InvoiceToText(invoice: Invoice):

         ret.append(f'  {line}')

     ret.append('')

     ret.append(f'Kundennummer:    {invoice.customerno}')

+    if invoice.id:

         ret.append(f'Rechnungsnummer: {invoice.id}')

+    if invoice.type:

         ret.append(f'Rechnungsdatum:  {invoice.date.strftime("%d.%m.%Y")}')

+    else:

+        ret.append(f'Datum:           {invoice.date.strftime("%d.%m.%Y")}')

     if invoice.leitweg_id:

         ret.append(f'Leitweg-ID:      {invoice.leitweg_id}')