invoice.git

@@ -5,6 +5,8 @@

       <sourceFolder url="file://$MODULE_DIR$/Invoice" isTestSource="false" />

       <sourceFolder url="file://$MODULE_DIR$/lib/python" isTestSource="false" />

       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />

+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />

+      <sourceFolder url="file://$MODULE_DIR$/external/python-drafthorse" isTestSource="false" />

     </content>

     <orderEntry type="jdk" jdkName="Python 3.12" jdkType="Python SDK" />

     <orderEntry type="sourceFolder" forTests="false" />

@@ -179,6 +179,12 @@ class Invoice(object):

                 "line3": None,

                 "country_id": None,

             },

+            "mandatory_details": {

+                "managers": [], #Geschäftsführer

+                "seat": None, # Sitz der Gesellschaft

+                "court": None, # Gericht

+                "number": None, # HRB

+            },

             "phone": None,

             "email": None,

             "website": None,

@@ -194,19 +194,26 @@ class PDF(object):

         self.canvas.setFont(self.font, 7)

         lines = list(filter(None, [

             self.invoice.seller['trade_name'],

-            self.invoice.seller['name'] if self.invoice.seller['trade_name'] else None,

-            self.invoice.seller['website'],

-            self.invoice.seller['email'],

+            self.invoice.seller['name'],

+            self.invoice.seller['address']['line1'],

+            self.invoice.seller['address']['line2'],

+            self.invoice.seller['address']['line3'],

+            f"{self.invoice.seller['address']['postcode']} {self.invoice.seller['address']['city_name']}",

         ]))

         c = 0

         for line in lines:

             c += 10

             self.canvas.drawString(self.leftcontent, self.bottomcontent - c, line)

+        lines = []

         if self.invoice.seller_vat_id:

-            lines = list(filter(None, [

-                "USt-ID: " + self.invoice.seller_vat_id

-            ]))

+            lines.append("USt-ID: " + self.invoice.seller_vat_id)

+        if self.invoice.seller["mandatory_details"]["managers"]:

+            lines.append(f'Geschäftsführer: {", ".join(self.invoice.seller["mandatory_details"]["managers"])}')

+        if self.invoice.seller["mandatory_details"]["seat"]:

+            lines.append(f'Sitz: {self.invoice.seller["mandatory_details"]["seat"]}')

+        if self.invoice.seller["mandatory_details"]["court"]:

+            lines.append(f'{self.invoice.seller["mandatory_details"]["court"]} {self.invoice.seller["mandatory_details"]["number"]}')

         c = 0

         for line in lines:

             c += 10

@@ -236,7 +243,7 @@ class PDF(object):

     def addressBox(self):

         lines = [

-            self.invoice.seller['trade_name'],

+            self.invoice.seller['trade_name'] or self.invoice.seller['name'],

             self.invoice.seller['address']['line1'],

             self.invoice.seller['address']['line2'],

             self.invoice.seller['address']['line3'],

@@ -59,6 +59,17 @@ def InvoiceToXML(invoice):

     # Seller-Address

     if invoice.seller['trade_name']:

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

+    if invoice.seller["mandatory_details"]["managers"]:

+        doc.trade.agreement.seller.description = "Geschäftsführer: " + ", ".join(invoice.seller["mandatory_details"]["managers"])

+    if invoice.seller["mandatory_details"]["seat"]:

+        doc.trade.agreement.seller.legal_organization.trade_address.city_name = invoice.seller["mandatory_details"]["seat"]

+        doc.trade.agreement.seller.legal_organization.trade_address.country_id = "DE"

+    if invoice.seller["mandatory_details"]["court"]:

+        doc.trade.agreement.seller.description = (

+            str(doc.trade.agreement.seller.description) + "\nRegistergericht: " + invoice.seller["mandatory_details"]["court"])

+    if invoice.seller["mandatory_details"]["number"]:

+        doc.trade.agreement.seller.legal_organization.id = ("0102", invoice.seller["mandatory_details"]["number"])

+

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

@@ -42,9 +42,9 @@ if __name__ == '__main__':

         invoice.order_number = referenzen['bestellnummer']

     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['name'] = 'schokokeks.org GmbH'

+    invoice.seller['contactPerson'] = ''

+    #invoice.seller['trade_name'] = 'schokokeks.org'

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

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

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

@@ -54,6 +54,10 @@ if __name__ == '__main__':

     invoice.seller['address']['line1'] = 'Köchersberg 32'

     invoice.seller['address']['line2'] = None

     invoice.seller['address']['line3'] = None

+    invoice.seller['mandatory_details']["managers"] = ["M. Mustermann", ]

+    invoice.seller['mandatory_details']["seat"] = "Murrhardt"

+    invoice.seller['mandatory_details']["court"] = "Amtsgericht Stuttgart"

+    invoice.seller['mandatory_details']["number"] = "HRB 123456"

     invoice.seller_vat_id = "DE255720588"

     invoice.buyer_vat_id = "AT123456789"

     invoice.type = RECHNUNG