invoice.git

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

         self.buyer = self.customer

         self.seller = {

             "name": None,  # juristischer Name

+            "contactPerson": None, # Name der Kontaktperson

             "trade_name": None,  # Firmenname

             "address": {

                 "postcode": None,

@@ -28,6 +28,10 @@ from drafthorse.pdf import attach_xml

 def InvoiceToXML(invoice):

     doc = Document()

     doc.context.guideline_parameter.id = "urn:cen.eu:en16931:2017"

+    if invoice.leitweg_id:

+        doc.context.guideline_parameter.id = "urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_3.0"

+    # Standardwert für XRechnung 3.0.1

+    doc.context.business_parameter.id = "urn:fdc:peppol.eu:2017:poacc:billing:01:1.0"

     doc.header.id = invoice.id

     # Typecodes:

     # 380: Handelsrechnungen

@@ -58,6 +62,9 @@ def InvoiceToXML(invoice):

     doc.trade.agreement.seller.address.line_one = invoice.seller['address']['line1']

     doc.trade.agreement.seller.address.line_two = invoice.seller['address']['line2']

     doc.trade.agreement.seller.address.line_three = invoice.seller['address']['line3']

+    # Für XRECHNUNG muss das Contact-Array mindestens eine Angabe enthalten

+    if invoice.seller['contactPerson']:

+        doc.trade.agreement.seller.contact.person_name = invoice.seller['contactPerson']

     if invoice.seller['phone']:

         doc.trade.agreement.seller.contact.telephone.number = invoice.seller['phone']

     if invoice.seller_vat_id:

@@ -68,6 +75,7 @@ def InvoiceToXML(invoice):

         email = URIUniversalCommunication()

         email.uri_ID = ('EM', invoice.seller['email'])

         doc.trade.agreement.seller.electronic_address.add(email)

+        doc.trade.agreement.seller.contact.email.address = invoice.seller['email']

     # Buyer-Address

     doc.trade.agreement.buyer.name = invoice.customer['name']

@@ -77,10 +85,24 @@ def InvoiceToXML(invoice):

     doc.trade.agreement.buyer.address.line_one = invoice.customer['address']['line1']

     doc.trade.agreement.buyer.address.line_two = invoice.customer['address']['line2']

     doc.trade.agreement.buyer.address.line_three = invoice.customer['address']['line3']

+    if invoice.leitweg_id:

+        leitwegid = URIUniversalCommunication()

+        leitwegid.uri_ID = ('0204', invoice.leitweg_id)

+        doc.trade.agreement.buyer.electronic_address.add(leitwegid)

+    # Bei ZUGFeRD 2.1 darf das Feld nur einmal vorkommen. In XRechnung 3.0 darf es mehrmals drin sein.

+    # drafthorse kann aktuell noch kein XRechnung 3.0 erzeugen, daher hier als "elif".

+    elif invoice.buyer['email']:

+        email = URIUniversalCommunication()

+        email.uri_ID = ('EM', invoice.buyer['email'])

+        doc.trade.agreement.buyer.electronic_address.add(email)

     if invoice.buyer_reference:

-        # "Leitweg-ID" in XRechnung

         doc.trade.agreement.buyer_reference = invoice.buyer_reference

+    elif invoice.leitweg_id:

+        # "Leitweg-ID" in XRechnung

+        # Wenn wir hier sind, ist die aber bereits in der electronic_address eingetragen,

+        # daher hier nur noch wiederholen, wenn wir das Feld nicht für was anderes brauchen (Kunden-Referenz).

+        doc.trade.agreement.buyer_reference = invoice.leitweg_id

     if invoice.order_number:

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

     if invoice.contract_number:

@@ -236,5 +258,5 @@ def InvoiceToXML(invoice):

     doc.trade.settlement.monetary_summation.due_amount = Decimal(f"{rest:.2f}")

     # Generate XML file

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

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

     return xml

@@ -43,10 +43,11 @@ if __name__ == '__main__':

     if 'vertragsnummer' in referenzen:

         invoice.contract_number = referenzen['vertragsnummer']

     invoice.seller['name'] = 'Bernd Wurst / Johannes Böck'

+    invoice.seller['contactPerson'] = 'Bernd Wurst / Johannes Böck'

     invoice.seller['trade_name'] = 'schokokeks.org GbR'

-    invoice.seller['email'] = 'xxxxxxx'

+    invoice.seller['email'] = 'xxx@example.com'

     invoice.seller['website'] = 'www.schokokeks.org'

-    invoice.seller['phone'] = None

+    invoice.seller['phone'] = '+49 123456789'

     invoice.seller['address']['country_id'] = 'DE'

     invoice.seller['address']['postcode'] = '71540'

     invoice.seller['address']['city_name'] = 'Murrhardt'

@@ -6,7 +6,7 @@ data = {

              'city': 'Murrhardt',

              'company': None,

              'country': 'DE',

-             'email': None,

+             'email': "kunde@kunde.de",

              'fax': None,

              'mobile': None,

              'name': 'Bernd Wurst',

@@ -43,6 +43,6 @@ data = {

               'mahnung': None,

               'notizen': None,

               'pdfdata': None,

-              'referenzen': '{"kundenreferenz": "KrfzNr", "bestellnummer": '

-                            '"08/15-BestNr4711"}',

+              'referenzen': '{"kundenreferenz": "KrfzNr", "vertragsnummer": "654321", "bestellnummer": '

+                            '"08/15-BestNr4711", "leitwegid": "012345678"}',

               'sepamandat': None}}