invoice.git

@@ -21,7 +21,7 @@ from .InvoiceObjects import InvoiceTable, InvoiceText, RECHNUNG, GUTSCHRIFT, KOR

     VAT_REGULAR, VAT_KLEINUNTERNEHMER, VAT_INNERGEM, PAYMENT_UEBERWEISUNG, PAYMENT_LASTSCHRIFT, UNITS

 from drafthorse.models.accounting import TradeAllowanceCharge

 from drafthorse.models.party import TaxRegistration, URIUniversalCommunication

-from drafthorse.models.payment import PaymentTerms

+from drafthorse.models.payment import PaymentTerms, PaymentMeans

 from drafthorse.models.note import IncludedNote

 from drafthorse.models import NS_QDT

 from drafthorse.pdf import attach_xml

@@ -187,7 +187,7 @@ def InvoiceToXML(invoice):

                 li.document.line_id = f"{line_id_count}"

                 if last_title:

                     title = IncludedNote()

-                    title.content.add(last_title)

+                    title.content = last_title

                     li.document.notes.add(title)

                 li.product.name = el['subject']

                 if 'desc' in el and el['desc'] != '':

@@ -278,7 +278,7 @@ def InvoiceToXML(invoice):

     for paragraph in textparts:

         note = IncludedNote()

-        note.content.add(paragraph)

+        note.content = paragraph

         doc.header.notes.add(note)

@@ -287,19 +287,20 @@ 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'

+    payment_means = PaymentMeans()

     if invoice.payment_type:

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

+        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.account_name = \

+        payment_means.payee_account.account_name = \

             invoice.seller_bank_data['kontoinhaber'] or invoice.seller['trade_name'] or invoice.seller['name']

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

+        payment_means.payee_account.iban = invoice.seller_bank_data['iban']

         if invoice.seller_bank_data['bic']:

-            doc.trade.settlement.payment_means.payee_institution.bic = invoice.seller_bank_data['bic']

+            payment_means.payee_institution.bic = invoice.seller_bank_data['bic']

     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']

-

+        payment_means.payer_account.iban = invoice.buyer_bank_data['iban']

+    doc.trade.settlement.payment_means.add(payment_means)

     terms = PaymentTerms()

     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."

@@ -1 +1 @@

-Subproject commit a62b2e86a84cbc78c2211fcaff975cd5e319394f

+Subproject commit cca3b5e2552b394e156df4e078089e9793568033