mikrowerk-edi-invoicing 0.3.3__tar.gz → 0.3.5__tar.gz

{mikrowerk_edi_invoicing-0.3.3/mikrowerk_edi_invoicing.egg-info → mikrowerk_edi_invoicing-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mikrowerk_edi_invoicing
-Version: 0.3.3
+Version: 0.3.5
 Summary: Parser for EDI invoices in CII or UBL format
 Author: Mikrowerk a Gammadata Division
 Author-email: info@mikrowerk.com

{mikrowerk_edi_invoicing-0.3.3 → mikrowerk_edi_invoicing-0.3.5}/edi_invoice_parser/cii_dom_parser/models/delivery.py

@@ -9,6 +9,7 @@ from .party import (
 from .references import (
     DeliveryNoteReferencedDocument,
     DespatchAdviceReferencedDocument,
+    ReceivingAdviceReferencedDocument
 )
 
 
@@ -59,6 +60,9 @@ class TradeDelivery(Element):
     delivery_note = Field(
         DeliveryNoteReferencedDocument, required=False, profile=EXTENDED
     )
+    receiving_advice_ref_document = Field(
+        ReceivingAdviceReferencedDocument, required=False, profile=EXTENDED
+    )
 
     class Meta:
         namespace = NS_RAM

{mikrowerk_edi_invoicing-0.3.3 → mikrowerk_edi_invoicing-0.3.5}/edi_invoice_parser/cii_dom_parser/models/references.py

@@ -139,6 +139,12 @@ class DeliveryNoteReferencedDocument(ReferencedDocument):
         tag = "DeliveryNoteReferencedDocument"
 
 
+class ReceivingAdviceReferencedDocument(ReferencedDocument):
+    class Meta:
+        namespace = NS_RAM
+        tag = "ReceivingAdviceReferencedDocument"
+
+
 class LineDeliveryNoteReferencedDocument(ReferencedDocument):
     class Meta:
         namespace = NS_RAM

{mikrowerk_edi_invoicing-0.3.3 → mikrowerk_edi_invoicing-0.3.5}/edi_invoice_parser/cii_dom_parser/xml_cii_dom_parser.py

@@ -33,6 +33,7 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
             notes=doc.header.notes.get_string_elements("\n"),
             languages=doc.header.languages.get_string_elements(";"),
             buyer_reference=doc.trade.agreement.buyer_reference.get_string(),
+            order_reference=doc.trade.agreement.buyer_order.issuer_assigned_id.get_string(),
             currency_code=doc.trade.settlement.currency_code.get_string(),
             line_total_amount=doc.trade.settlement.monetary_summation.line_total.get_value(),
             charge_total_amount=doc.trade.settlement.monetary_summation.charge_total.get_value(),
@@ -134,10 +135,12 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
     @staticmethod
     def map_bank_account(payment_means: any) -> XRechnungBankAccount:
         return XRechnungBankAccount(
-            iban="".join(payment_means.payee_account.iban.get_string().split()) if hasattr(payment_means,
-                                                                                           'payee_account') else None,
-            bic=payment_means.payee_institution.bic.get_string() if hasattr(payment_means,
-                                                                            'payee_institution') else None,
+            iban="".join(payment_means.payee_account.iban.get_string().split()) if (hasattr(payment_means,
+                                                                                            'payee_account')
+                                                                                    and payment_means.payee_account.iban.get_string()) else None,
+            bic=payment_means.payee_institution.bic.get_string() if (hasattr(payment_means,
+                                                                             'payee_institution')
+                                                                     and payment_means.payee_institution.bic) else None,
         )
 
     @staticmethod

{mikrowerk_edi_invoicing-0.3.3 → mikrowerk_edi_invoicing-0.3.5}/edi_invoice_parser/model/x_rechnung.py

@@ -209,7 +209,7 @@ class XRechnung:
         _dict = asdict(trade_party)
         _dict.update({
             'postal_address': cls.map_trade_address(trade_party.postal_address),
-            'trade_contact': cls.map_trade_contact(trade_party.trade_contact)
+            'trade_contact': cls.map_trade_contact(trade_party.trade_contact, trade_party)
         })
         return _dict
 
@@ -221,10 +221,12 @@ class XRechnung:
         return _dict
 
     @classmethod
-    def map_trade_contact(cls, trade_contact: XRechnungTradeContact) -> dict | None:
+    def map_trade_contact(cls, trade_contact: XRechnungTradeContact, trade_party: XRechnungTradeParty) -> dict | None:
         if trade_contact is None:
             return None
         _dict = asdict(trade_contact)
+        if _dict.get('name', None) is None or _dict.get('name', None) == '':
+            _dict.update({'name': trade_party.name})
         return _dict
 
     @classmethod

{mikrowerk_edi_invoicing-0.3.3 → mikrowerk_edi_invoicing-0.3.5}/edi_invoice_parser/tests/test_parse_x_rechnung.py

@@ -24,10 +24,10 @@ class XRechnungEinfachTestCase(unittest.TestCase):
         ('xml', 'e_invoicing_EN16931/CII_business_example_02.xml'),
         ('xml', 'e_invoicing_EN16931/CII_business_example_Z.xml'),
         ('xml', 'e_invoicing_EN16931/CII_example1.xml'),
-        # # ('xml', 'e_invoicing_EN16931/CII_example2.xml'),  # throws error
+        ('xml', 'e_invoicing_EN16931/CII_example2.xml'),  # throws error
         ('xml', 'e_invoicing_EN16931/CII_example3.xml'),
         ('xml', 'e_invoicing_EN16931/CII_example4.xml'),
-        # # ('xml', 'e_invoicing_EN16931/CII_example5.xml'),  # throws error
+        ('xml', 'e_invoicing_EN16931/CII_example5.xml'),  # throws error
         ('xml', 'e_invoicing_EN16931/CII_example6.xml'),
         ('xml', 'e_invoicing_EN16931/CII_example7.xml'),
         ('xml', 'e_invoicing_EN16931/CII_example8.xml'),

{mikrowerk_edi_invoicing-0.3.3 → mikrowerk_edi_invoicing-0.3.5/mikrowerk_edi_invoicing.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mikrowerk_edi_invoicing
-Version: 0.3.3
+Version: 0.3.5
 Summary: Parser for EDI invoices in CII or UBL format
 Author: Mikrowerk a Gammadata Division
 Author-email: info@mikrowerk.com

{mikrowerk_edi_invoicing-0.3.3 → mikrowerk_edi_invoicing-0.3.5}/setup.py

@@ -16,7 +16,7 @@ setuptools.setup(
     name="mikrowerk_edi_invoicing",
 
     # version of the module
-    version="0.3.3",
+    version="0.3.5",
 
     # Name of Author
     author="Mikrowerk a Gammadata Division",