invoice.git

@@ -107,6 +107,12 @@ VAT_REGULAR = 'S'

 VAT_KLEINUNTERNEHMER = 'E'

 VAT_INNERGEM = 'K'

+PAYMENT_LASTSCHRIFT = "59"

+PAYMENT_UEBERWEISUNG = "30"

+PAYMENT_BANKKONTO = "42"

+PAYMENT_BAR = "10"

+PAYMENT_KARTE = "48"

+

 class Invoice(object):

     def __init__(self, tender = False):

         self.customerno = None

@@ -148,6 +154,7 @@ class Invoice(object):

         }

         self.due_date = None

         self.debit = False

+        self.payment_type = PAYMENT_UEBERWEISUNG

         self.debit_mandate_id = None

         self.creditor_reference_id = None

         self.buyer_bank_data = {

@@ -21,7 +21,7 @@ import os.path

 import reportlab

 from reportlab.lib import fonts

-from .InvoiceObjects import InvoiceTable, InvoiceText, InvoiceImage

+from .InvoiceObjects import InvoiceTable, InvoiceText, InvoiceImage, GUTSCHRIFT

 import re

 # reportlab imports

@@ -308,8 +308,10 @@ class PDF(object):

             self.canvas.drawString(self.rightcolumn, self.y, line)

             self.y -= (self.font_size + 5)

         self.y -= 5

+        if self.invoice.seller['phone']:

             self.canvas.drawString(self.rightcolumn, self.y, f"Tel: {self.invoice.seller['phone']}")

             self.y -= (self.font_size + 5)

+        if self.invoice.seller['email']:

             self.canvas.drawString(self.rightcolumn, self.y, f"E-Mail: {self.invoice.seller['email']}")

             self.y -= (self.font_size + 10)

         self.y = -9.5*cm

@@ -353,6 +355,8 @@ class PDF(object):

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

             if self.invoice.tender:

                 introText = 'hiermit unterbreiten wir Ihnen folgendes Angebot.'

+            if self.invoice.type == GUTSCHRIFT:

+                introText = 'nach unserer Berechnung entsteht für Sie folgende Gutschrift.'

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

             for line in intro:

                 self.canvas.drawString(self.leftcontent, self.y, line)

@@ -36,7 +36,7 @@ from drafthorse.models.document import Document

 from drafthorse.models.accounting import ApplicableTradeTax

 from drafthorse.models.tradelines import LineItem

 from .InvoiceObjects import InvoiceTable, InvoiceText, InvoiceImage, RECHNUNG, GUTSCHRIFT, KORREKTUR, \

-    VAT_REGULAR, VAT_KLEINUNTERNEHMER, VAT_INNERGEM

+    VAT_REGULAR, VAT_KLEINUNTERNEHMER, VAT_INNERGEM, PAYMENT_UEBERWEISUNG, PAYMENT_LASTSCHRIFT

 from drafthorse.models.party import TaxRegistration, URIUniversalCommunication

 from drafthorse.models.payment import PaymentTerms

 from drafthorse.models.note import IncludedNote

@@ -44,7 +44,7 @@ from drafthorse.pdf import attach_xml

 def InvoiceToXML(invoice):

     doc = Document()

-    doc.context.guideline_parameter.id = "urn:cen.eu:en16931:2017#conformant#urn:factur-x.eu:1p0:extended"

+    doc.context.guideline_parameter.id = "urn:cen.eu:en16931:2017#conformant#urn:factur-x.eu:1p0:en16931"

     doc.header.id = invoice.id

     # Typecodes:

     # 380: Handelsrechnungen

@@ -196,23 +196,24 @@ def InvoiceToXML(invoice):

         doc.trade.settlement.creditor_reference_id = invoice.creditor_reference_id

     doc.trade.settlement.payment_reference = invoice.id

     doc.trade.settlement.currency_code = 'EUR'

-    if invoice.debit:

-        doc.trade.settlement.payment_means.type_code = "59"

-    else:

-        doc.trade.settlement.payment_means.type_code = "30"

-    if invoice.seller_bank_data['iban']:

+    if invoice.payment_type:

+        doc.trade.settlement.payment_means.type_code = invoice.payment_type

+

+    if invoice.seller_bank_data['iban'] and invoice.payment_type == PAYMENT_UEBERWEISUNG:

         doc.trade.settlement.payment_means.payee_account.iban = invoice.seller_bank_data['iban']

         doc.trade.settlement.payment_means.payee_institution.bic = "GENODES1VBK"

         # Ist in der Library vorhanden, validiert aber nicht im XML?!

-    if invoice.buyer_bank_data['iban']:

+    if invoice.buyer_bank_data['iban'] and invoice.payment_type == PAYMENT_LASTSCHRIFT:

         # Kunden-Bankverbindung bei Lastschrift

         doc.trade.settlement.payment_means.payer_account.iban = invoice.buyer_bank_data['iban']

     terms = PaymentTerms()

-    if invoice.due_date:

+    if invoice.due_date and invoice.payment_type == PAYMENT_UEBERWEISUNG:

         terms.description = f"Bitte begleichen Sie den Betrag bis zum {invoice.due_date.strftime('%d.%m.%Y')} ohne Abzüge."

         terms.due = invoice.due_date

-    if invoice.debit:

+    if invoice.type == GUTSCHRIFT:

+        terms.description = f"Wir überweisen den Betrag auf Ihr Konto."

+    elif invoice.debit:

         if invoice.debit_mandate_id:

             # Mandatsreferenz für Lastschrift

             terms.debit_mandate_id = invoice.debit_mandate_id

@@ -231,7 +232,7 @@ def InvoiceToXML(invoice):

     # Generate XML file

-    xml = doc.serialize(schema="FACTUR-X_EXTENDED")

+    xml = doc.serialize(schema="FACTUR-X_EN16931")

     return xml