chellow 1688376223.0.0__py3-none-any.whl → 1688634635.0.0__py3-none-any.whl

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/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/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/templates/e/dc_contract.html

@@ -70,7 +70,7 @@
 			<a href="/e/dc_batches?dc_contract_id={{dc_contract.id}}">Batches</a>
 		</li>
 		<li>
-			<a href="/e/channel_snags?dc_contract_id={{dc_contract.id}}&days_hidden=5"
+			<a href="/e/channel_snags?dc_contract_id={{dc_contract.id}}&amp;days_hidden=5"
 				>Channel Snags</a>
 		</li>
 		<li>

{chellow-1688376223.0.0.dist-info → chellow-1688634635.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1688376223.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)
@@ -12,11 +12,11 @@ Requires-Dist: flask==2.3.2
 Requires-Dist: odio==0.0.22
 Requires-Dist: openpyxl==3.0.10
 Requires-Dist: pep3143daemon==0.0.6
-Requires-Dist: pg8000==1.29.3
+Requires-Dist: pg8000==1.29.8
 Requires-Dist: pip>=9.0.1
 Requires-Dist: psutil==5.9.4
 Requires-Dist: pympler==1.0.1
-Requires-Dist: pypdf==3.6.0
+Requires-Dist: pypdf==3.12.0
 Requires-Dist: pysftp==0.2.9
 Requires-Dist: python-dateutil==2.8.2
 Requires-Dist: pytz==2022.6

{chellow-1688376223.0.0.dist-info → chellow-1688634635.0.0.dist-info}/RECORD

@@ -34,18 +34,18 @@ chellow/e/scenario.py,sha256=IuyE494XaBLq3FW7NdJePD6J4cTzPogfACO6dThiY00,23239
 chellow/e/system_price.py,sha256=IPBLSRPzGA3yca4tpR8PJemwPbgqVjn1WnljOMUyWnA,8145
 chellow/e/tlms.py,sha256=gXBZTHXqGVcaTGHaYGVA5Ir5pzoBDqFC1Kl1mQ0IDqU,9549
 chellow/e/tnuos.py,sha256=kxp9EXPCXv_yAbMRbpqa5b6fsw3KJ290zNaGU3piWgo,20647
-chellow/e/views.py,sha256=O-CncMPfTSGbUR3dabPtn7umRozTaIq0onSZdU_lHUI,179181
+chellow/e/views.py,sha256=FFzAY6TNQy1Rf1UrlWtqrvI765b47XWnqpVxvfnBdbM,179196
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=v1s4O8phVJVn9sOs9HKrKYcECAP0ApnUgqCaa2ARYiQ,4234
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=4dAWjaxsDnnGBnRAjgFe7IZLxIcLMGiTuXh1uqNnnlQ,4382
 chellow/e/bill_parsers/bgb_edi.py,sha256=GuwHeYbAGk7BVg5n19FcTANFDyKI-y0z3f9niQaPSSw,4828
 chellow/e/bill_parsers/csv.py,sha256=C86VGyqHBE_PklPxEOfXVKJ4l4Ll9BE1Z0lpCj86EOs,5132
-chellow/e/bill_parsers/engie_edi.py,sha256=mnfENBzHwieJI2MRu1tBLt9NAv6lDZj2BzCKAyZPxrY,13910
+chellow/e/bill_parsers/engie_edi.py,sha256=jUPSNYecxxn8CwOs_VtlMVlEGjj2S9T3c-Kt654MeTs,13911
 chellow/e/bill_parsers/engie_xls.py,sha256=jrut2heH_ZWmSjcn7celOydZS9Y49GfpYjDk_EKwamI,14453
 chellow/e/bill_parsers/gdf_csv.py,sha256=ZfK3Oc6oP28p_P9DIevLNB_zW2WLcEJ3Lvb1gL310YU,7382
 chellow/e/bill_parsers/haven_csv.py,sha256=Ft81mqHTbCQl6dMLkLin777vAX2T999Q_4fkNwl-naM,13606
 chellow/e/bill_parsers/haven_edi.py,sha256=eN40WL--JkX7TNIefgZohYv0BQ8vOm6AqkWlJSW5Mmk,16188
-chellow/e/bill_parsers/haven_edi_tprs.py,sha256=xJjEhxmcaUmY0PrJn8-qj-OIGf6dbCzt6SrxYUApOlc,10989
+chellow/e/bill_parsers/haven_edi_tprs.py,sha256=HGrVZoJegqGv2_82PjLyCd1Zjuycwe5QEm6URpwOMEc,11365
 chellow/e/bill_parsers/mm.py,sha256=P4CdkskDrjmFMSDp0ehE_ichTBHGywbT_dckMxuAqQQ,1929
 chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=MF74mh6gdBb0lqvPyPZIv_7vsqNu_zNXWpIzlNFtl1g,4576
 chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=4Dfq4N0ZOgD_x3ZJ9CnGzsLbwhS1-7aTJqFx00GCnU0,6007
@@ -178,7 +178,7 @@ chellow/templates/e/dc_bill_add.html,sha256=73Sn_MKBsUuYYnDfUMCdX1Dul6GimMC9YXk6
 chellow/templates/e/dc_bill_edit.html,sha256=0GsN-ZIc4q-z_xs8igC2ZS6t4soo2SvB3qRA6iC-AuM,2707
 chellow/templates/e/dc_bill_import.html,sha256=NHjMSoFizvFQIaPWuVE3nTCtMDTzJB0XmH8jXfV1tiA,2188
 chellow/templates/e/dc_bill_imports.html,sha256=lCaUR47r9KPr0VrQhEvVEaKexM5R_nmkxtzgpWZ0e9s,2135
-chellow/templates/e/dc_contract.html,sha256=Sk1sZjx1gNJc0aC7wgfB6se9fC1BL4G3x6VDV-95GD8,2322
+chellow/templates/e/dc_contract.html,sha256=_fq_s69kmbrGlScYngRYm4cPdRgh2roMvSfvG0J4xzA,2326
 chellow/templates/e/dc_contract_edit.html,sha256=UPLx82pXHY3Wc9JKc_Hdqw4nXJ2gCiEn5wPIk-aREXA,2963
 chellow/templates/e/dc_contract_hh_import.html,sha256=UODiBFNohb60MjH1w-9JW1JE0O9GR2uKPGw-lD7Da5g,848
 chellow/templates/e/dc_contract_hh_imports.html,sha256=eXFDGyzSgag4JRism81_p5yTzQOjCIXaVkQ8tl3dDcM,8172
@@ -350,6 +350,6 @@ chellow/templates/g/supply_note_edit.html,sha256=6UQf_qbhFDys3cVsTp-c7ABWZpggW9R
 chellow/templates/g/supply_notes.html,sha256=WR3YwGh_qqTklSJ7JqWX6BKBc9rk_jMff4RiWZiF2CM,936
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1688376223.0.0.dist-info/METADATA,sha256=-RfRvhzGTQTqkDCkCHBcaezBjQ6gol6ReabjdKqxJlY,12160
-chellow-1688376223.0.0.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
-chellow-1688376223.0.0.dist-info/RECORD,,
+chellow-1688634635.0.0.dist-info/METADATA,sha256=f1l6z43YKxkD0_2H4Ze0bRe7ANlgjDd1GS7UCDNC5ck,12161
+chellow-1688634635.0.0.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
+chellow-1688634635.0.0.dist-info/RECORD,,