invoice.git

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

             lines = [

                 f"IBAN: {iban}",

                 self.invoice.seller_bank_data['bankname'],

-                f"BIC: {self.invoice.seller_bank_data['bic']}"

+                f"BIC: {self.invoice.seller_bank_data['bic']}" if self.invoice.seller_bank_data['bic'] else None,

             ]

             c = 0

             for line in lines:

@@ -120,14 +120,14 @@ def InvoiceToXML(invoice):

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

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

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

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

+                # C62 = ohne Einheit

+                # H87 = Stück

+                # MON = Month

                 # LTR = Liter (1 dm3)

-                # MTQ = cubic meter

                 # KGM = Kilogram

                 # MTR = Meter

-                # H87 = Piece

                 # TNE = Tonne

-                # MON = Month

                 li.settlement.trade_tax.type_code = "VAT"

                 if invoice.vat_type == VAT_REGULAR:

@@ -198,8 +198,8 @@ def InvoiceToXML(invoice):

     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.seller_bank_data['bic']:

+            doc.trade.settlement.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']

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

     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.type == GUTSCHRIFT:

+    if invoice.type in [GUTSCHRIFT, KORREKTUR]:

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

     elif invoice.debit:

         if invoice.debit_mandate_id: