chellow 1688456919.0.0__tar.gz → 1688634635.0.0__tar.gz

{chellow-1688456919.0.0 → chellow-1688634635.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1688456919.0.0
+Version: 1688634635.0.0
 Summary: Web Application for checking UK energy bills.
 Project-URL: Homepage, https://github.com/WessexWater/chellow
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)

chellow-1688634635.0.0/VERSION

@@ -0,0 +1 @@
+__version__ = "1688634635.0.0"

{chellow-1688456919.0.0 → chellow-1688634635.0.0}/chellow/e/bill_parsers/engie_edi.py

@@ -362,7 +362,7 @@ def _process_VAT(elements, headers):
         "net": Decimal("0.00"),
         "vat": vat,
         "gross": vat,
-        "breakdown": {"vat_percentage": vat_percentage, "vat_net": vat_net},
+        "breakdown": {"vat": {vat_percentage: {"vat": vat, "net": vat_net}}},
         "reads": [],
     }
 

{chellow-1688456919.0.0 → chellow-1688634635.0.0}/chellow/e/bill_parsers/haven_edi_tprs.py

@@ -298,15 +298,29 @@ def _process_MAN(elements, headers):
 
 def _process_VAT(elements, headers):
     uvla = elements["UVLA"]
-    net = to_decimal(uvla) / Decimal("100")
+    net = Decimal("0.00") + to_decimal(uvla) / Decimal("100")
     headers["net"] += net
     uvtt = elements["UVTT"]
-    headers["vat"] += to_decimal(uvtt) / Decimal("100")
+    vat = Decimal("0.00") + to_decimal(uvtt) / Decimal("100")
+    headers["vat"] += vat
     ucsi = elements["UCSI"]
-    headers["gross"] += to_decimal(ucsi) / Decimal("100")
+    headers["gross"] += Decimal("0.00") + to_decimal(ucsi) / Decimal("100")
     vat_percentage = to_decimal(elements["VATP"]) / Decimal("1000")
-    headers["breakdown"]["vat_percentage"] = vat_percentage
-    headers["breakdown"]["vat_net"] = net
+    bd = headers["breakdown"]
+    if "vat" in bd:
+        vat_breakdown = bd["vat"]
+    else:
+        vat_breakdown = bd["vat"] = {}
+
+    try:
+        vat_values = vat_breakdown[vat_percentage]
+    except KeyError:
+        vat_values = vat_breakdown[vat_percentage] = {
+            "vat": Decimal("0.00"),
+            "net": Decimal("0.00"),
+        }
+    vat_values["vat"] += vat
+    vat_values["net"] += net
 
 
 def _process_NOOP(elements, headers):

{chellow-1688456919.0.0 → chellow-1688634635.0.0}/chellow/e/views.py

@@ -3907,15 +3907,15 @@ def supplier_batch_get(batch_id):
 
         if bill.vat != 0:
             bd = bill.bd
-            if "vat_percentage" in bd and "vat_net" in bd:
-                vat_percentage = bd["vat_percentage"]
-                try:
-                    vbd = vat_breakdown[vat_percentage]
-                except KeyError:
-                    vbd = vat_breakdown[vat_percentage] = defaultdict(int)
-
-                vbd["vat"] += bill.vat
-                vbd["net"] += bd["vat_net"]
+            if "vat" in bd:
+                for vat_percentage, vat_vals in bd["vat"].items():
+                    try:
+                        vbd = vat_breakdown[vat_percentage]
+                    except KeyError:
+                        vbd = vat_breakdown[vat_percentage] = defaultdict(int)
+
+                    vbd["vat"] += vat_vals["vat"]
+                    vbd["net"] += vat_vals["net"]
 
     config_contract = Contract.get_non_core_by_name(g.sess, "configuration")
     properties = config_contract.make_properties()

{chellow-1688456919.0.0 → chellow-1688634635.0.0}/test/e/bill_parsers/test_bill_parser_haven_edi_tprs.py

@@ -10,6 +10,7 @@ from chellow.e.bill_parsers.haven_edi_tprs import (
     _process_MAN,
     _process_MHD,
     _process_MTR,
+    _process_VAT,
 )
 from chellow.utils import utc_datetime
 
@@ -377,6 +378,27 @@ def test_process_CCD1_ebrs(mocker):
     assert headers == expected_headers
 
 
+def test_process_VAT(mocker):
+    elements = {"UVLA": ["600"], "UVTT": ["150"], "UCSI": ["850"], "VATP": ["20000"]}
+    headers = {
+        "net": Decimal("0.00"),
+        "vat": Decimal("0.00"),
+        "gross": Decimal("0.00"),
+        "breakdown": defaultdict(int),
+    }
+
+    _process_VAT(elements, headers)
+    expected_headers = {
+        "net": Decimal("6.00"),
+        "vat": Decimal("1.50"),
+        "gross": Decimal("8.50"),
+        "breakdown": {
+            "vat": {Decimal("20"): {"vat": Decimal("1.50"), "net": Decimal("6.00")}}
+        },
+    }
+    assert headers == expected_headers
+
+
 def test_Parser(mocker, sess):
     file_lines = [
         "MHD=2+UTLBIL:3'",

chellow-1688456919.0.0/VERSION

@@ -1 +0,0 @@
-__version__ = "1688456919.0.0"