mikrowerk-edi-invoicing 0.2.0__tar.gz → 0.2.1__tar.gz

{mikrowerk_edi_invoicing-0.2.0/mikrowerk_edi_invoicing.egg-info → mikrowerk_edi_invoicing-0.2.1}/PKG-INFO

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

{mikrowerk_edi_invoicing-0.2.0 → mikrowerk_edi_invoicing-0.2.1}/edi_invoice_parser/model/x_rechnung.py

@@ -178,7 +178,7 @@ class XRechnung:
     def map_tradeline_to_dict(cls, x_trade_line: XRechnungTradeLine) -> dict:
         _dict = asdict(x_trade_line)
         _dict.update(
-            {'trade_tax': asdict(x_trade_line.trade_tax),
+            {'trade_tax': asdict(x_trade_line.trade_tax) if x_trade_line.trade_tax is not None else None,
              'price_unit': float(x_trade_line.price_unit),
              'quantity_billed': float(x_trade_line.quantity_billed),
              'total_amount_net': float(x_trade_line.total_amount_net),

{mikrowerk_edi_invoicing-0.2.0 → mikrowerk_edi_invoicing-0.2.1}/edi_invoice_parser/x_mapper/xml_ubl_sax_parser.py

@@ -8,8 +8,8 @@ import xml.sax as sax
 from decimal import Decimal
 
 from ..model.x_rechnung import (XRechnung, XRechnungTradeParty, XRechnungTradeAddress, XRechnungTradeContact,
-                              XRechnungPaymentMeans, XRechnungBankAccount, XRechnungCurrency, XRechnungTradeLine,
-                              XRechnungAppliedTradeTax)
+                                XRechnungPaymentMeans, XRechnungBankAccount, XRechnungCurrency, XRechnungTradeLine,
+                                XRechnungAppliedTradeTax)
 from .xml_abstract_x_rechnung_parser import XMLAbstractXRechnungParser
 
 
@@ -58,6 +58,10 @@ class UblSaxHandler(sax.ContentHandler):
                 self.current_payment_means.payee_account = XRechnungBankAccount()
             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":
@@ -65,6 +69,9 @@ class UblSaxHandler(sax.ContentHandler):
 
         _path = '/'.join([tag for tag, _attrs in self.stack])
 
+        if _path.endswith('/AllowanceCharge/TaxCategory'):
+            self.current_trade_tax = XRechnungAppliedTradeTax()
+
         print(f">>>>>>>>>>>>>>> start: {_ns} {_tag_name} >>>>>>>>>>>>>>>>")
         print(_path)
         for k, v in attrs.items():
@@ -83,10 +90,14 @@ 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:
+            self.handle_allowance_charge(_path, _tag_name, _content, attrs)
         if "/ClassifiedTaxCategory" in _path:
             self.handle_trade_tax(_path, _tag_name, _content, attrs)
         if "/TaxTotal/TaxSubtotal" in _path:
             self.handle_trade_tax(_path, _tag_name, _content, attrs)
+        if "/AllowanceCharge/TaxCategory" in _path:
+            self.handle_trade_tax(_path, _tag_name, _content, attrs)
 
         # collect results when closing a main tag
         match _tag_name:
@@ -102,6 +113,13 @@ 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"
+            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)
+            self.trade_line_list.append(self.current_trade_line)
 
         # invoice top level properties
         self.handle_invoice(_path, _tag_name, _content, attrs)
@@ -239,6 +257,17 @@ class UblSaxHandler(sax.ContentHandler):
         elif path.endswith("/InvoiceLine/Price/PriceAmount"):
             self.current_trade_line.price_unit = float(content)
 
+    def handle_allowance_charge(self, path: str, tag: str, content: str, attr=None):
+        if path.endswith("/AllowanceCharge/AllowanceChargeReason"):
+            self.current_trade_line.name = content
+        elif path.endswith("/AllowanceCharge/Amount"):
+            self.current_trade_line.price_unit = float(content)
+        elif path.endswith("/AllowanceCharge/ChargeIndicator"):
+            if content.lower() == "true":
+                self.current_trade_line.quantity_billed = 1.0
+            else:
+                self.current_trade_line.quantity_billed = -1.0
+
     def handle_trade_tax(self, path: str, tag: str, content: str, attr=None):
         if path.endswith("/ClassifiedTaxCategory/ID") or path.endswith("/TaxCategory/ID"):
             self.current_trade_tax.category_code = content

{mikrowerk_edi_invoicing-0.2.0 → mikrowerk_edi_invoicing-0.2.1/mikrowerk_edi_invoicing.egg-info}/PKG-INFO

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

{mikrowerk_edi_invoicing-0.2.0 → mikrowerk_edi_invoicing-0.2.1}/setup.py

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