chellow 1718904221.0.0__py3-none-any.whl → 1719570651.0.0__py3-none-any.whl

chellow/e/bill_parsers/mm.py

@@ -68,11 +68,16 @@ CHARGE_UNITS_LOOKUP = {
     "SAG": "days",
     "TNUOS": "days",
     "REAP": "kvarh",
+    "DCDA": "days",
+    "MOP1": "days",
+    "COMM": "days",
 }
 
 ELEMENT_LOOKUP = {
     "10ANNUAL": "standing",
     "20RS0108": "single",
+    "30ANNUAL": "mop",
+    "50ANNUAL": "dc",
     "9WANNUAL": "site-fee",
     "20RS0123": "day",
     "30RS0123": "night",

chellow/models.py

@@ -7486,6 +7486,18 @@ def db_upgrade_47_to_48(sess, root_path):
         DtcMeterType.insert(sess, code, desc)
 
 
+def db_upgrade_48_to_49(sess, root_path):
+    for code, factor_str in (
+        ("MCUF", "28.316846592"),
+        ("HCUF", "2.8316846592"),
+        ("TCUF", "0.28316846592"),
+        ("OCUF", "0.028316846592"),
+    ):
+        g_unit = GUnit.get_by_code(sess, code)
+        g_unit.factor = Decimal(factor_str)
+        sess.flush()
+
+
 upgrade_funcs = [None] * 18
 upgrade_funcs.extend(
     [
@@ -7519,6 +7531,7 @@ upgrade_funcs.extend(
         db_upgrade_45_to_46,
         db_upgrade_46_to_47,
         db_upgrade_47_to_48,
+        db_upgrade_48_to_49,
     ]
 )
 

chellow/templates/supplies.html

@@ -126,15 +126,10 @@
 			<tbody>
 				{% for g_era in g_eras %}
 					<tr>
-						<td>
-							<a href="/g_supplies/{{g_era.g_supply_id}}">supply</a>
-						</td>
+						<td><a href="/g/supplies/{{g_era.g_supply_id}}">supply</a></td>
 						<td>{{g_era.g_supply.mprn}}</td>
 						<td>{{g_era.msn}}</td>
-						<td>
-							<a
-									href="/g_contracts/{{g_era.g_contract.id}}"
-									>{{g_era.g_contract.name}}</a>
+						<td><a href="/g/contracts/{{g_era.g_contract.id}}">{{g_era.g_contract.name}}</a>
 						</td>
 						<td>{{g_era.account}}</td>
 					</tr>

{chellow-1718904221.0.0.dist-info → chellow-1719570651.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1718904221.0.0
+Version: 1719570651.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-1718904221.0.0.dist-info → chellow-1719570651.0.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=5SmP-0QPK6xCkd_wjIWh_8FAzN5OxNHCzyEQ1Xb-Y-M,5256
 chellow/edi_lib.py,sha256=alu20x9ZX06iPfnNI9dEJzuP6RIf4We3Y_M_bl7RrcY,51789
 chellow/general_import.py,sha256=l3EHq9zG9Vfl5Ee6XTVrC1nusXo4YGGB4VBmZ_JaJR8,65798
-chellow/models.py,sha256=l2bFiDgU_Wv6jpyRjAlOKMbO2AEMtka-dTigNFENNeY,242727
+chellow/models.py,sha256=SYLBU6olcoYlrqSGeF6YYDHP_1pf4xT_M1QpHDOYCIs,243088
 chellow/national_grid.py,sha256=uxcv0qisHPyzw9AVIYPzsRqwt2XPAcZL-SBR12qcrS0,4364
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
@@ -51,7 +51,7 @@ chellow/e/bill_parsers/gdf_csv.py,sha256=ZfK3Oc6oP28p_P9DIevLNB_zW2WLcEJ3Lvb1gL3
 chellow/e/bill_parsers/haven_csv.py,sha256=0uENq8IgVNqdxfBQMBxLTSZWCOuDHXZC0xzk52SbfyE,13652
 chellow/e/bill_parsers/haven_edi.py,sha256=YGPHRxPOhje9s32jqPHHELni2tooOYj3cMC_qaZVPq4,16107
 chellow/e/bill_parsers/haven_edi_tprs.py,sha256=ZVX9CCqUybsot_Z0BEOJPvl9x5kSr7fEWyuJXvZDcz4,11841
-chellow/e/bill_parsers/mm.py,sha256=ShhaVc0IpShpy4Q2pfj3EfjhpjbffQutKsAq6ivNiys,8522
+chellow/e/bill_parsers/mm.py,sha256=WpjKJZ0HW6Yko3aZiq43HQU-i_rrBWgQTqggJB3FIEU,8627
 chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=yogXTuQHGRL7IiqvRWr2C9V24ez1j9Yx0128UygPE_k,4723
 chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=PlEqCZuJ9DfQXeeYQ64jtf3ML7sUt_tt61QOOTnkE5c,6380
 chellow/e/bill_parsers/sse_edi.py,sha256=L85DOfNkqexeEIEr8pCBn_2sHJI-zEaw6cogpE3YyYM,15204
@@ -147,7 +147,7 @@ chellow/templates/site_hh_data.html,sha256=xmSJ5h_DvI1-bnV7FdBodDUvDCU0-q-UHYj2M
 chellow/templates/site_months.html,sha256=oXtCN7YD4_QhDkXfRsrmhLAEhIMHaGdK1EmTmECfN6o,6562
 chellow/templates/site_used_graph.html,sha256=NXuQYcPXnk2mHb2O4mxVPZ1R-X-MWPwneUV-J6z285w,3094
 chellow/templates/sites.html,sha256=4ouJ5xYqYHjXCv3cDucTjgbOd_whReFPPHopLBdW6Go,621
-chellow/templates/supplies.html,sha256=o1BLUlmiuRDlBEVxMIqvlXt2PskggcMrWtk2xBJSy54,3530
+chellow/templates/supplies.html,sha256=Ie_4K4-KwXqrCBwaUcjWxmV27rYjeESI_DCS9gLUipk,3488
 chellow/templates/system.html,sha256=PP8MN8mieil3AwLS1WlQBcgbl0J61bksN-Cy4toYNqo,1871
 chellow/templates/tester.html,sha256=4DYrtcnFY0y6o3K6_tSmFpPlCRngZj1zo8nJ1NI4pk8,623
 chellow/templates/user.html,sha256=7nl_awpvotaaEO1UBA6DL4yjSUNTxgQjFx9dhnwcoFE,3255
@@ -364,6 +364,6 @@ chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1
 chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBeyRzQe3Rg,854
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1718904221.0.0.dist-info/METADATA,sha256=IisGBzL1b8FQnHDQYk0fVZH4QA21ue5l6JYZ8K4pVIE,12205
-chellow-1718904221.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-chellow-1718904221.0.0.dist-info/RECORD,,
+chellow-1719570651.0.0.dist-info/METADATA,sha256=yaaDeEPCR9gyn7FAzr9s9ysogjV22XbTtqdeLVAJWHI,12205
+chellow-1719570651.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1719570651.0.0.dist-info/RECORD,,

{chellow-1718904221.0.0.dist-info → chellow-1719570651.0.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.24.2
+Generator: hatchling 1.25.0
 Root-Is-Purelib: true
 Tag: py3-none-any