invoice.git

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

     # Seller-Address

     if invoice.seller['trade_name']:

-        pass

-        # FIXME: specified_legal_organization ist in der Library nicht implementiert, pull request ist vorhanden

-        # doc.trade.agreement.seller.specified_legal_organization.trade_name = invoice.seller['trade_name']

+        doc.trade.agreement.seller.legal_organization.trade_name = invoice.seller['trade_name']

     doc.trade.agreement.seller.name = invoice.seller['name']

     doc.trade.agreement.seller.address.country_id = invoice.seller['address']['country_id']

     doc.trade.agreement.seller.address.postcode = invoice.seller['address']['postcode']

@@ -69,8 +67,7 @@ def InvoiceToXML(invoice):

     if invoice.seller['email']:

         email = URIUniversalCommunication()

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

-        # FIXME: Typo in der Library ("adress")?

-        doc.trade.agreement.seller.electronic_adress.add(email)

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

     # Buyer-Address

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

@@ -59,7 +59,7 @@ if __name__ == '__main__':

     invoice.seller_bank_data['kontoinhaber'] = "schokokeks.org GbR"

     invoice.seller_bank_data['iban'] = "DE91602911200041512006"

     invoice.seller_bank_data['bic'] = "GENODES1VBK"

-    invoice.seller_bank_data['bankname'] = 'Volksbank'

+    invoice.seller_bank_data['bankname'] = 'Volksbank Backnang'

     invoice.id = str(rechnungsnummer)

     invoice.customerno = rechnung['kunde']

     invoice.customer['name'] = adresse['company'] or adresse['name']

@@ -176,15 +176,16 @@ if __name__ == '__main__':

                 # Im Fehlerfall ?!

                 with open(tmp2.name, 'rb') as f:

                     pdfdata = f.read()

-        except:

+        except Exception as e:

+            print(e)

             # Wenn hier was schiefgeht, nutzen wir das alte PDF

             pass

         # FIXME: Die Metadaten sind noch nicht gültig, da scheint es einen Fehler in der drafthorse-Library zu geben

-        pdfdata = attach_xml(pdfdata, xmldata, 'EXTENDED')

+        pdfdata = attach_xml(pdfdata, xmldata)

     f = open(filename, "wb")

     f.write(pdfdata)

     f.close()

     print(filename)

-    print(textdata)

+    #print(textdata)