invoice.git

@@ -159,8 +159,10 @@ class Invoice(object):

         self.due_date = None

         self.debit = False

         self.payment_type = PAYMENT_UEBERWEISUNG

+        self.leitweg_id = None

         self.buyer_reference = None

         self.order_number = None

+        self.contract_number = None

         self.debit_mandate_id = None

         self.creditor_reference_id = None

         self.buyer_bank_data = {

@@ -347,6 +347,22 @@ class PDF(object):

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

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

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

+        if self.invoice.leitweg_id:

+            self.canvas.drawString(self.rightcolumn, self.y, "Leitweg-ID:")

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

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

+        if self.invoice.buyer_reference:

+            self.canvas.drawString(self.rightcolumn, self.y, "Kunden-Referenz:")

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

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

+        if self.invoice.contract_number:

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

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

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

+        if self.invoice.order_number:

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

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

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

         self.canvas.setFont(self.font, self.font_size)

         if self.invoice.salutation:

@@ -39,6 +39,15 @@ def InvoiceToText(invoice: Invoice):

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

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

+    if invoice.leitweg_id:

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

+    if invoice.buyer_reference:

+        ret.append(f'Kunden-Referenz: {invoice.buyer_reference}')

+    if invoice.contract_number:

+        ret.append(f'Vertragsnummer:  {invoice.contract_number}')

+    if invoice.order_number:

+        ret.append(f'Ihre Bestellnummer: {invoice.order_number}')

+

     ret.append('')

     for part in invoice.parts:

         if isinstance(part, InvoiceTable):

@@ -99,6 +99,10 @@ def InvoiceToXML(invoice):

     if invoice.buyer_reference:

         # "Leitweg-ID" in XRechnung

         doc.trade.agreement.buyer_reference = invoice.buyer_reference

+    if invoice.order_number:

+        doc.trade.agreement.buyer_order.issuer_assigned_id = invoice.order_number

+    if invoice.contract_number:

+        doc.trade.agreement.contract.issuer_assigned_id = invoice.contract_number

     # Line Items

     summe_netto = 0.0

@@ -124,7 +128,9 @@ def InvoiceToXML(invoice):

                         li.settlement.period.start = el['period_start']

                         li.settlement.period.end = el['period_end']

                     else:

-                        li.delivery.event.occurrence = el['period_start']

+                        #li.delivery.event.occurrence = el['period_start']

+                        # FIXME: Fehler in drafthorse?! Wird nicht akzeptiert.

+                        pass

                 # FIXME: Hier sollte der passende Code benutzt werden (z.B. Monat)

                 li.delivery.billed_quantity = (Decimal(el['count']), 'C62')