mikrowerk-edi-invoicing 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

edi_invoice_parser/cii_dom_parser/models/elements.py

@@ -356,7 +356,8 @@ class DateTimeElement(StringElement):
         if len(root) != 1:
             raise TypeError("Date containers should have one child")
         if root[0].tag != "{%s}%s" % (self._date_time_namespace, "DateTimeString"):
-            raise TypeError("Tag %s not recognized" % root[0].tag)
+            # raise TypeError("Tag %s not recognized" % root[0].tag)
+            print("TypeError: Tag %s not recognized" % root[0].tag)
         self._format = root[0].attrib["format"]
         if self._format == "102":
             self._value = datetime.strptime(root[0].text, "%Y%m%d").date()

edi_invoice_parser/tests/test_parse_x_rechnung.py

@@ -38,7 +38,8 @@ class XRechnungEinfachTestCase(unittest.TestCase):
         ('pdf', 'zugferd/BASIC-WL_Einfach/BASIC-WL_Einfach.pdf'),
         # ('pdf', 'zugferd/XRECHNUNG_Einfach/XRECHNUNG_Einfach.pdf'), # needs some checks, why test failed
         # ("pdf", "zugferd/XRECHNUNG_Elektron/XRECHNUNG_Elektron.pdf"), # needs some checks, why test failed
-        ('pdf', 'odoo_generated/INV_2025_00001.pdf')
+        ('pdf', 'odoo_generated/INV_2025_00001.pdf'),
+
     ])
     def test_x_rechnung_files(self, file_type, file_path):
         print(f"start testing with file: {file_path}")

edi_invoice_parser/ubl_sax_parser/xml_ubl_sax_parser.py

@@ -29,11 +29,14 @@ class UblSaxHandler(sax.ContentHandler):
         self.trade_line_list: [XRechnungTradeLine] = []
         self.current_trade_tax: XRechnungAppliedTradeTax | None = None
         self.applicable_trade_taxes: [XRechnungAppliedTradeTax] = []
+        self.allowance_line_count = 99900
+        self.allowance_line_count_incr = 10
 
     def startDocument(self):
         print("------------------------------ Start ---------------------------------------------------")
         self.x_rechnung = XRechnung()
         self.stack = deque()
+        self.allowance_line_count = 99900
 
     def endDocument(self):
         self.x_rechnung.name = (
@@ -45,6 +48,7 @@ class UblSaxHandler(sax.ContentHandler):
         _ns, _tag_name = name
         self.current_attributes = attrs
         self.stack.append((_tag_name, attrs))
+        _path = '/'.join([tag for tag, _attrs in self.stack])
         self.content = ""
         match _tag_name:
             case "Party":
@@ -59,15 +63,14 @@ class UblSaxHandler(sax.ContentHandler):
             case "InvoiceLine":
                 self.current_trade_line = XRechnungTradeLine()
                 self.current_trade_tax = None
-            case "AllowanceCharge":
-                self.current_trade_line = XRechnungTradeLine()
-                self.current_trade_tax = None
             case "TaxSubtotal":
                 self.current_trade_tax = XRechnungAppliedTradeTax()
             case "ClassifiedTaxCategory":
                 self.current_trade_tax = XRechnungAppliedTradeTax()
-
-        _path = '/'.join([tag for tag, _attrs in self.stack])
+            case "AllowanceCharge":
+                if _path.endswith('Invoice/AllowanceCharge'):
+                    self.current_trade_line = XRechnungTradeLine()
+                    self.current_trade_tax = None
 
         if _path.endswith('/AllowanceCharge/TaxCategory'):
             self.current_trade_tax = XRechnungAppliedTradeTax()
@@ -90,7 +93,7 @@ class UblSaxHandler(sax.ContentHandler):
             self.handle_payment_means(_path, _tag_name, _content, attrs)
         if "/InvoiceLine" in _path:
             self.handle_invoice_line(_path, _tag_name, _content, attrs)
-        if "/AllowanceCharge" in _path:
+        if "Invoice/AllowanceCharge" in _path:
             self.handle_allowance_charge(_path, _tag_name, _content, attrs)
         if "/ClassifiedTaxCategory" in _path:
             self.handle_trade_tax(_path, _tag_name, _content, attrs)
@@ -114,8 +117,10 @@ class UblSaxHandler(sax.ContentHandler):
         if _path.endswith("Invoice/TaxTotal/TaxSubtotal"):
             self.applicable_trade_taxes.append(self.current_trade_tax)
         elif _path.endswith('Invoice/AllowanceCharge'):
-            self.current_trade_line.trade_tax = self.current_trade_tax
-            self.current_trade_line.line_id = "99999"
+            if hasattr(self.current_trade_line, "trade_tax"):
+                self.current_trade_line.trade_tax = self.current_trade_tax
+            self.current_trade_line.line_id = f"{self.allowance_line_count}"
+            self.allowance_line_count += self.allowance_line_count_incr
             self.current_trade_line.seller_assigned_id = "AllowanceCharge"
             self.current_trade_line.total_amount_net = (
                     self.current_trade_line.price_unit * self.current_trade_line.quantity_billed)
@@ -139,6 +144,8 @@ class UblSaxHandler(sax.ContentHandler):
                 self.x_rechnung.doc_id = content
             case "Invoice/IssueDate":
                 self.x_rechnung.issued_date_time = datetime.fromisoformat(content)
+            case "Invoice/Delivery/ActualDeliveryDate":
+                self.x_rechnung.delivered_date_time = datetime.fromisoformat(content)
             case "Invoice/InvoiceTypeCode":
                 self.x_rechnung.doc_type_code = content
             case "Invoice/DocumentCurrencyCode":
@@ -160,8 +167,8 @@ class UblSaxHandler(sax.ContentHandler):
                     self.x_rechnung.payment_means = self.current_payment_means_list[0]
             case "Invoice/PaymentTerms/Note":
                 self.x_rechnung.payment_terms = content
-            case "Invoice/AllowanceCharge/Amount":
-                self.x_rechnung.allowance_total_amount = Decimal(content)
+            # case "Invoice/AllowanceCharge/Amount":
+            #     self.x_rechnung.allowance_total_amount = Decimal(content)
             case "Invoice/TaxTotal/TaxAmount":
                 self.x_rechnung.tax_total_amount = [XRechnungCurrency(Decimal(content),
                                                                       attrs.get('currencyID', 'EUR'))]
@@ -244,6 +251,8 @@ class UblSaxHandler(sax.ContentHandler):
             self.current_trade_line.total_amount_net = float(content)
         elif path.endswith("/InvoiceLine/Item/Description"):
             self.current_trade_line.description = content
+        elif path.endswith("/InvoiceLine/Note"):
+            self.current_trade_line.description += f", {content}" if len(content) > 0 else content
         elif path.endswith("/InvoiceLine/Item/Name"):
             self.current_trade_line.name = content
         elif path.endswith("/InvoiceLine/Item/SellersItemIdentification/ID"):

{mikrowerk_edi_invoicing-0.3.0.dist-info → mikrowerk_edi_invoicing-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: mikrowerk_edi_invoicing
-Version: 0.3.0
+Version: 0.3.2
 Summary: Parser for EDI invoices in CII or UBL format
 Author: Mikrowerk a Gammadata Division
 Author-email: info@mikrowerk.com
@@ -28,6 +28,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

{mikrowerk_edi_invoicing-0.3.0.dist-info → mikrowerk_edi_invoicing-0.3.2.dist-info}/RECORD

@@ -11,7 +11,7 @@ edi_invoice_parser/cii_dom_parser/models/accounting.py,sha256=_ngHDoBruw6v5QbLeA
 edi_invoice_parser/cii_dom_parser/models/container.py,sha256=IRrYWPu2sMcLpSPj63w_Ge-8UpjChspPvP-DSk201X0,2584
 edi_invoice_parser/cii_dom_parser/models/delivery.py,sha256=Y4_MHzj0St2zup-Z_orq5wlxPncx71BHh3cSHaleAYI,1903
 edi_invoice_parser/cii_dom_parser/models/document.py,sha256=U3HaJNSk_c3bb9cHjjFuikKGq6ksLxZ71XJySTAAS6E,3091
-edi_invoice_parser/cii_dom_parser/models/elements.py,sha256=M6k_76QZY5UjLdRJcUTyJcRJnhNnAY331PHRLoSA7GQ,13549
+edi_invoice_parser/cii_dom_parser/models/elements.py,sha256=X-URXvF_6rKg58fyR8EJAe_Y4s54t8naz5hEDc4OZiU,13619
 edi_invoice_parser/cii_dom_parser/models/fields.py,sha256=UMwlaFpumCbpaX-iPKsAV3MqZEic4G_sokAQR3dgWhc,10867
 edi_invoice_parser/cii_dom_parser/models/note.py,sha256=eswaCmiLR_5JVTXVkyLlE_eXzXTEPr_C8dqqyjlHgZU,487
 edi_invoice_parser/cii_dom_parser/models/party.py,sha256=BF5cpJyw88QGYbsvc_aKxo0XGe4VZNfdKaCMm5wVGGQ,5309
@@ -25,13 +25,13 @@ edi_invoice_parser/model/x_rechnung.py,sha256=2aJRPO5k_X82mLXjJl361mSvf7APSv2eFA
 edi_invoice_parser/model/xml_abstract_x_rechnung_parser.py,sha256=puxCSC02zIXpfMY9xNLqY-w0aRv0y5ROHmNtmaV16o4,673
 edi_invoice_parser/tests/__init__.py,sha256=gnkvp4ZsQ0g1L5r6fbyhvFNsSKp0PegdvVeQP_dVQSw,142
 edi_invoice_parser/tests/test_iban_handling.py,sha256=suRaB9gxbNc2Dc7spjHmQyPBdXva98HF1js85wQWqPM,662
-edi_invoice_parser/tests/test_parse_x_rechnung.py,sha256=t4XegzQna0l30B13p3CluIUU5YLBQCSRn-AxHrrl2d8,3558
+edi_invoice_parser/tests/test_parse_x_rechnung.py,sha256=3QuaFhuvcHEr0bAgHPhlY14tYvN-gJEwOY8f9jAo_50,3560
 edi_invoice_parser/ubl_sax_parser/__init__.py,sha256=P3QhOExirTKDRre-ReGBVv_GFZniEj_kOnWtUSNJGq0,91
-edi_invoice_parser/ubl_sax_parser/xml_ubl_sax_parser.py,sha256=wYVnEWvvC_ZJsnDdrnWTvkCi9FZaHuS76VTqKPDpVPg,15589
+edi_invoice_parser/ubl_sax_parser/xml_ubl_sax_parser.py,sha256=p0-gDt5WsPTrs6a_o6y3HLNDNvNZewc4iLirDUZ9YIk,16248
 edi_invoice_parser/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edi_invoice_parser/util/file_helper.py,sha256=4gdWbv8L9LSMraLKvGI1Z3NMcuGGy7JB1qFvNaW-yo4,767
-mikrowerk_edi_invoicing-0.3.0.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-mikrowerk_edi_invoicing-0.3.0.dist-info/METADATA,sha256=HCXzcD2fucxZmU0oKgflQR1ryEv2hFbeu3mk_SzhqFA,1000
-mikrowerk_edi_invoicing-0.3.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mikrowerk_edi_invoicing-0.3.0.dist-info/top_level.txt,sha256=OyIJDXDBfR9f0EvTDTmEHdXEFHscjRqX1MxeOeT2VKM,19
-mikrowerk_edi_invoicing-0.3.0.dist-info/RECORD,,
+mikrowerk_edi_invoicing-0.3.2.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+mikrowerk_edi_invoicing-0.3.2.dist-info/METADATA,sha256=QfWKUmLrvyBN72-WBcqRwLXaFcL_9NYZ4JghVWSbVpc,1022
+mikrowerk_edi_invoicing-0.3.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+mikrowerk_edi_invoicing-0.3.2.dist-info/top_level.txt,sha256=OyIJDXDBfR9f0EvTDTmEHdXEFHscjRqX1MxeOeT2VKM,19
+mikrowerk_edi_invoicing-0.3.2.dist-info/RECORD,,

{mikrowerk_edi_invoicing-0.3.0.dist-info → mikrowerk_edi_invoicing-0.3.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any