mikrowerk-edi-invoicing 0.6.6__py3-none-any.whl → 0.7.0__py3-none-any.whl

edi_invoice_parser/cii_dom_parser/dom_elements_helper.py

@@ -38,7 +38,7 @@ def get_currency(self) -> (any, any):
         return self._amount, self._amount
 
 
-def get_currencies(self) -> [(any, any)]:
+def get_currencies(self) -> list[tuple[any, any]]:
     res = []
     if self.children:
         for currency in self.children:

edi_invoice_parser/cii_dom_parser/xml_cii_dom_parser.py

@@ -13,20 +13,20 @@ from ..model.xml_abstract_x_rechnung_parser import XMLAbstractXRechnungParser
 class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
 
     @classmethod
-    def parse_and_map_x_rechnung(cls, _xml: any) -> TradeDocument:
+    def parse_and_map_x_rechnung(cls, _xml) -> TradeDocument:
         doc = Document.parse(_xml)
-        return cls().map_to_x_rechnung(doc)
+        return cls.map_to_x_rechnung(doc)
 
     @classmethod
-    def map_to_x_rechnung(cls, doc: any) -> TradeDocument:
+    def map_to_x_rechnung(cls, doc) -> TradeDocument:
         """
         :param doc: Element, the parsed dom root element
         :return:
         """
 
         return TradeDocument(
-            name=f"{cls().TYPE_CODES.get(doc.header.type_code.get_string(), 'Unknown doc type ')} {doc.header.id.get_string()}",
-            doc_type_name=f"{cls().TYPE_CODES.get(doc.header.type_code.get_string(), 'Unknown doc type ')}",
+            name=f"{cls.TYPE_CODES.get(doc.header.type_code.get_string(), 'Unknown doc type ')} {doc.header.id.get_string()}",
+            doc_type_name=f"{cls.TYPE_CODES.get(doc.header.type_code.get_string(), 'Unknown doc type ')}",
             doc_id=doc.header.id.get_string(),
             doc_type_code=int(doc.header.type_code.get_string()) if doc.header.type_code else None,
             issued_date_time=doc.header.issue_date_time.get_value(),
@@ -40,59 +40,58 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
             allowance_total_amount=doc.trade.settlement.monetary_summation.allowance_total.get_value(),
             tax_basis_total_amount=TradeCurrency.from_currency_tuple(
                 doc.trade.settlement.monetary_summation.tax_basis_total.get_currency()),
-            tax_total_amount=[TradeCurrency.from_currency_tuple(tpl) for tpl in
-                              doc.trade.settlement.monetary_summation.tax_total_other_currency.get_currencies()],
-            # list of currency
+            tax_total_amount=cls.map_total_tax(doc.trade.settlement.monetary_summation.tax_total_other_currency),
             grand_total_amount=TradeCurrency.from_currency_tuple(
                 doc.trade.settlement.monetary_summation.grand_total.get_currency()),
             total_prepaid_amount=doc.trade.settlement.monetary_summation.prepaid_total.get_value(),
             due_payable_amount=doc.trade.settlement.monetary_summation.due_amount.get_value(),
             delivered_date_time=datetime.now(),
-            payment_means=cls().map_payment_means(
+            payment_means=cls.map_payment_means(
                 doc.trade.settlement.payment_means) if doc.trade.settlement.payment_means else None,
             payment_terms=doc.trade.settlement.terms.get_string_elements("\n"),
-            sender=cls().map_trade_party(doc.trade.agreement.seller) if hasattr(doc.trade.agreement,
-                                                                                "seller") else None,
-            invoicee=cls().map_trade_party(doc.trade.agreement.invoicee) if hasattr(doc.trade.agreement,
-                                                                                    "invoicee") else None,
-            receiver=cls().map_trade_party(doc.trade.agreement.buyer) if hasattr(doc.trade.agreement,
-                                                                                 "buyer") else None,
-            payee=cls().map_trade_party(doc.trade.agreement.payee) if hasattr(doc.trade.agreement, "payee") else None,
-            trade_line_items=cls().map_trade_line_items(doc.trade.items) if hasattr(doc.trade, "items") else None,
-            applicable_trade_taxes=cls().map_trade_taxes(doc.trade.settlement.trade_tax) if hasattr(
+            sender=cls.map_trade_party(doc.trade.agreement.seller) if hasattr(doc.trade.agreement,
+                                                                              "seller") else None,
+            invoicee=cls.map_trade_party(doc.trade.agreement.invoicee) if hasattr(doc.trade.agreement,
+                                                                                  "invoicee") else None,
+            receiver=cls.map_trade_party(doc.trade.agreement.buyer) if hasattr(doc.trade.agreement,
+                                                                               "buyer") else None,
+            payee=cls.map_trade_party(doc.trade.agreement.payee) if hasattr(doc.trade.agreement, "payee") else None,
+            trade_line_items=cls.map_trade_line_items(doc.trade.items) if hasattr(doc.trade, "items") else None,
+            applicable_trade_taxes=cls.map_trade_taxes(doc.trade.settlement.trade_tax) if hasattr(
                 doc.trade.settlement,
-                "trade_tax") else None
+                "trade_tax") else []
         )
 
     @classmethod
-    def map_trade_party(cls, trade_party: any) -> TradeParty:
-        _global_id_schema, _global_id = cls().map_first_id(trade_party.global_id)
+    def map_trade_party(cls, trade_party) -> TradeParty:
+        _global_id_schema, _global_id = cls.map_first_id(trade_party.global_id)
         return TradeParty(
             name=trade_party.name.get_string(),
             description=trade_party.description.get_string(),
             global_id=_global_id,
             global_id_schema=_global_id_schema,
-            email=cls().map_electronic_address(trade_party.electronic_address, 'EM') if hasattr(trade_party,
-                                                                                                "electronic_address") else None,
-            vat_registration_number=cls().map_tax_registration(trade_party.tax_registrations, 'VA') if hasattr(
+            email=cls.map_electronic_address(trade_party.electronic_address, 'EM') if hasattr(trade_party,
+                                                                                              "electronic_address") else None,
+            vat_registration_number=cls.map_tax_registration(trade_party.tax_registrations, 'VA') if hasattr(
                 trade_party, 'tax_registrations') else None,
-            fiscal_registration_number=cls().map_tax_registration(trade_party.tax_registrations, 'FC') if hasattr(
+            fiscal_registration_number=cls.map_tax_registration(trade_party.tax_registrations, 'FC') if hasattr(
                 trade_party, 'tax_registrations') else None,
-            address=cls().map_trade_address(trade_party.address) if hasattr(trade_party, 'address') else None,
-            contact=cls().map_trade_contact(trade_party.contact) if hasattr(trade_party, 'contact') else None,
+            address=cls.map_trade_address(trade_party.address) if hasattr(trade_party, 'address') else None,
+            contact=cls.map_trade_contact(trade_party.contact) if hasattr(trade_party, 'contact') else None,
             id=trade_party.id.get_string() if hasattr(trade_party, 'id') else None,
         )
 
     @staticmethod
-    def map_first_id(global_id: any) -> (str, str):
+    def map_first_id(global_id) -> tuple[str | None, str | None]:
         if global_id is not None and hasattr(global_id, "children") and len(global_id.children) > 0:
             for child in global_id.children:
                 return child
+            return None, None
         else:
             return None, None
 
     @staticmethod
-    def map_electronic_address(electronic_address: any, schema_id: str) -> str | None:
+    def map_electronic_address(electronic_address, schema_id: str) -> str | None:
         if electronic_address is not None and hasattr(electronic_address, "children") and len(
                 electronic_address.children) > 0:
             for child in electronic_address.children:
@@ -102,7 +101,7 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
         return None
 
     @staticmethod
-    def map_tax_registration(tax_reg: any, schema_id: str) -> str | None:
+    def map_tax_registration(tax_reg, schema_id: str) -> str | None:
         if tax_reg is not None and hasattr(tax_reg, "children") and len(
                 tax_reg.children) > 0:
             for child in tax_reg.children:
@@ -112,7 +111,7 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
         return None
 
     @staticmethod
-    def map_trade_address(trade_address: any) -> TradePartyAddress:
+    def map_trade_address(trade_address) -> TradePartyAddress:
         return TradePartyAddress(
             city_name=trade_address.city_name.get_string(),
             country_id=trade_address.country_id.get_string(),
@@ -124,7 +123,7 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
         )
 
     @staticmethod
-    def map_trade_contact(trade_contact: any) -> TradePartyContact:
+    def map_trade_contact(trade_contact) -> TradePartyContact:
         return TradePartyContact(
             name=trade_contact.person_name.get_string(),
             email=trade_contact.email.get_string(),
@@ -134,7 +133,7 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
         )
 
     @staticmethod
-    def map_bank_account(payment_means: any) -> BankAccount:
+    def map_bank_account(payment_means) -> BankAccount:
         return BankAccount(
             iban="".join(payment_means.payee_account.iban.get_string().split()) if (hasattr(payment_means,
                                                                                             'payee_account')
@@ -145,24 +144,24 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
         )
 
     @staticmethod
-    def map_financial_card(financial_card: any) -> FinancialCard:
+    def map_financial_card(financial_card) -> FinancialCard:
         return FinancialCard(
             id=financial_card.id.get_string(),
             cardholder_name=financial_card.cardholder_name.get_string(),
         )
 
     @classmethod
-    def map_payment_means(cls, payment_means: any) -> TradePaymentMeans:
+    def map_payment_means(cls, payment_means) -> TradePaymentMeans:
         return TradePaymentMeans(
             information=payment_means.information.get_string(),
             type_code=payment_means.type_code.get_string(),
-            payee_account=cls().map_bank_account(payment_means) if hasattr(payment_means, 'payee_account') else None,
-            financial_card=cls().map_financial_card(payment_means.financial_card) if hasattr(payment_means,
-                                                                                             'financial_card') else None,
+            payee_account=cls.map_bank_account(payment_means) if hasattr(payment_means, 'payee_account') else None,
+            financial_card=cls.map_financial_card(payment_means.financial_card) if hasattr(payment_means,
+                                                                                           'financial_card') else None,
         )
 
     @staticmethod
-    def map_trade_tax(trade_tax: any) -> AppliedTradeTax:
+    def map_trade_tax(trade_tax) -> AppliedTradeTax:
         return AppliedTradeTax(
             type_code=trade_tax.type_code.get_string(),
             name=f"{trade_tax.type_code.get_string()} {trade_tax.rate_applicable_percent.get_value()}",
@@ -173,14 +172,21 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
         )
 
     @classmethod
-    def map_trade_taxes(cls, trade_taxes: any) -> [TradeLine]:
+    def map_trade_taxes(cls, trade_taxes) -> list[TradeLine]:
         res = []
         for child in trade_taxes.children:
-            res.append(cls().map_trade_tax(child))
+            res.append(cls.map_trade_tax(child))
         return res
 
     @classmethod
-    def map_trade_line(cls, trade_line: any) -> TradeLine:
+    def map_total_tax(cls, _tax_total_other_currency):
+        if _tax_total_other_currency and len(_tax_total_other_currency.get_currencies()) > 0:
+            return _tax_total_other_currency.get_currencies()[0]
+        else:
+            return None
+
+    @classmethod
+    def map_trade_line(cls, trade_line) -> TradeLine:
         return TradeLine(
             name=trade_line.product.name.get_string(),
             description=trade_line.product.description.get_string(),
@@ -195,12 +201,12 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
             seller_assigned_id=trade_line.product.seller_assigned_id.get_string(),
             buyer_assigned_id=trade_line.product.buyer_assigned_id.get_string(),
             global_product_scheme_id=trade_line.product.global_id._scheme_id,
-            tax=cls().map_trade_tax(trade_line.settlement.trade_tax)
+            tax=cls.map_trade_tax(trade_line.settlement.trade_tax)
         )
 
     @classmethod
-    def map_trade_line_items(cls, trade_line_items: any) -> [TradeLine]:
+    def map_trade_line_items(cls, trade_line_items) -> list[TradeLine]:
         res = []
         for child in trade_line_items.children:
-            res.append(cls().map_trade_line(child))
+            res.append(cls.map_trade_line(child))
         return res

edi_invoice_parser/model/trade_document_types.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-import datetime
+from datetime import datetime
 
 """
 UBL Document Type (XML Root)	Description	UNCL 1001 Code (Example)
@@ -46,9 +46,9 @@ class TradePartyContact:
 
 @dataclass
 class TradeParty:
-    name: str= None
+    name: str = None
     description: str = None  # 'Description'
-    global_id: int = 0  # 'Global ID'
+    global_id: str = None  # 'Global ID'
     global_id_schema: str = None  # 'Global Schema'
     id: str = None  # 'id'
     address: TradePartyAddress | None = None
@@ -151,9 +151,9 @@ class TradeDocument:
     charge_total_amount: float = None  # 'Charge Total Amount'
     allowance_total_amount: float = None  # 'Allowance Total Amount'
     tax_basis_total_amount: TradeCurrency = None
-    tax_total_amount: [TradeCurrency] = None  # 'Tax Grand Total Amount'
+    tax_total_amount: TradeCurrency = None  # 'Tax Grand Total Amount'
     grand_total_amount: TradeCurrency = None  # 'Grand Total Amount'
     total_prepaid_amount: float = None  # 'Total Prepaid Amount'
     due_payable_amount: float = None  # 'Due Payable Amount'
-    trade_line_items: [TradeLine] = None
-    applicable_trade_taxes: [AppliedTradeTax] = None
+    trade_line_items: list[TradeLine] = None
+    applicable_trade_taxes: list[AppliedTradeTax] = None

{mikrowerk_edi_invoicing-0.6.6.dist-info → mikrowerk_edi_invoicing-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mikrowerk_edi_invoicing
-Version: 0.6.6
+Version: 0.7.0
 Summary: Parser for EDI invoices in CII or UBL format or plain pdf with LLM support
 Author: Mikrowerk a Gammadata Division
 Author-email: info@mikrowerk.com

{mikrowerk_edi_invoicing-0.6.6.dist-info → mikrowerk_edi_invoicing-0.7.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 edi_invoice_parser/__init__.py,sha256=jvA8QaZLZlEuNhHA0p58zdtZdkBatdrixYY4vPXfl4k,740
 edi_invoice_parser/cross_industry_invoice_mapper.py,sha256=PCByIKH0srVnXqKR3orcQsrAxcqAtp_ljcmhNIv2FS8,1402
 edi_invoice_parser/cii_dom_parser/__init__.py,sha256=J9O0f-t1570oDgC_zWT6-MpjOYA6o3whazbe9ffQqjE,188
-edi_invoice_parser/cii_dom_parser/dom_elements_helper.py,sha256=2w_6794DFMaBc-uQFzgjt7ciZT4FHia2tfuJsTXNZ3w,3922
+edi_invoice_parser/cii_dom_parser/dom_elements_helper.py,sha256=u-RmUdlilKf3qZNhzWPmXPFy1QGfbPGiVOFd6QtgMDY,3931
 edi_invoice_parser/cii_dom_parser/pdf.py,sha256=1bbXWdqIGmrnYvkS284oc6ZVvH995vd9qB8-xdcDtf0,13270
 edi_invoice_parser/cii_dom_parser/utils.py,sha256=_ZaPPb1YeDWid3GP-9ojYDwm35HaJyXGGT_nIoiGSMw,624
-edi_invoice_parser/cii_dom_parser/xml_cii_dom_parser.py,sha256=_qUPvwGmuRw-dRFmSB_gJQg5rCUrwbTaOBEe98cWLqc,11371
+edi_invoice_parser/cii_dom_parser/xml_cii_dom_parser.py,sha256=0CRxE0Uc-K-8LMJ-TswSHtEZlibxIh_oPtpipSGe7Lc,11458
 edi_invoice_parser/cii_dom_parser/xmp_schema.py,sha256=UXQnZT3L2PQMendI_vyjemddhw209gMjH5woIK07TEM,4085
 edi_invoice_parser/cii_dom_parser/models/__init__.py,sha256=LANSc9OLmHBP8iv5RKlvvv8ugBGJjWycantnRi5Lt0I,439
 edi_invoice_parser/cii_dom_parser/models/accounting.py,sha256=_ngHDoBruw6v5QbLeA23QarAQ0fOascCz0ISpnD9aPs,6714
@@ -21,7 +21,7 @@ edi_invoice_parser/cii_dom_parser/models/references.py,sha256=2LYJGJU5KkJse-UsUc
 edi_invoice_parser/cii_dom_parser/models/trade.py,sha256=exlMrVMzj9aMb0qI3c610G3GuB6Z5ttM4qkFfK5tn3o,6968
 edi_invoice_parser/cii_dom_parser/models/tradelines.py,sha256=262opVT4pWXKEc_-HTEqVjm4yqQhvz639QNckEQCthY,5650
 edi_invoice_parser/model/__init__.py,sha256=gdzehRQK27DRpc-datjXMSkcs5GvxPFtph02wLE1Kns,647
-edi_invoice_parser/model/trade_document_types.py,sha256=nmNzSG0bK9FCUzF1KmR1SUvgEx8ACaXezhLV_a97eYQ,5060
+edi_invoice_parser/model/trade_document_types.py,sha256=z3UZonSKST8y4z41SDW2anWFdNxdjKlEfjPrnAzbWiw,5084
 edi_invoice_parser/model/xml_abstract_x_rechnung_parser.py,sha256=ufkXX4OP0_CjsB9pjF0-h_MJerkOx4JeY54nULi_BUA,691
 edi_invoice_parser/tests/__init__.py,sha256=KhEmBFKreDn5PGQFEnBzTAI7IkxtRj_H0dMxk_tuo54,160
 edi_invoice_parser/tests/test_iban_handling.py,sha256=suRaB9gxbNc2Dc7spjHmQyPBdXva98HF1js85wQWqPM,662
@@ -31,8 +31,8 @@ edi_invoice_parser/ubl_sax_parser/xml_ubl_sax_parser.py,sha256=eZETsQi0MZ7f0SvyR
 edi_invoice_parser/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edi_invoice_parser/util/file_helper.py,sha256=4gdWbv8L9LSMraLKvGI1Z3NMcuGGy7JB1qFvNaW-yo4,767
 edi_invoice_parser/util/timer_helper.py,sha256=X1XSV03iLZ4xfjELj_axlvNxzR2sOrJInXiv9HU2Fyg,284
-mikrowerk_edi_invoicing-0.6.6.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-mikrowerk_edi_invoicing-0.6.6.dist-info/METADATA,sha256=U0MD5izPgIf9rCAxqF0tUkeuib_7OqkWFptwQe3w2Ks,1080
-mikrowerk_edi_invoicing-0.6.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mikrowerk_edi_invoicing-0.6.6.dist-info/top_level.txt,sha256=OyIJDXDBfR9f0EvTDTmEHdXEFHscjRqX1MxeOeT2VKM,19
-mikrowerk_edi_invoicing-0.6.6.dist-info/RECORD,,
+mikrowerk_edi_invoicing-0.7.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+mikrowerk_edi_invoicing-0.7.0.dist-info/METADATA,sha256=KQtdnz8NnvRxbxxOQL4oCC0oT2Ns2rqez3DB6TTHCDs,1080
+mikrowerk_edi_invoicing-0.7.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+mikrowerk_edi_invoicing-0.7.0.dist-info/top_level.txt,sha256=OyIJDXDBfR9f0EvTDTmEHdXEFHscjRqX1MxeOeT2VKM,19
+mikrowerk_edi_invoicing-0.7.0.dist-info/RECORD,,

{mikrowerk_edi_invoicing-0.6.6.dist-info → mikrowerk_edi_invoicing-0.7.0.dist-info}/WHEEL

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