chellow 1728986476.0.0__py3-none-any.whl → 1729012049.0.0__py3-none-any.whl

chellow/e/bill_parsers/mm.py

@@ -172,7 +172,8 @@ def _handle_0461(headers, pre_record, record):
     mpan_core = parse_mpan_core(parts["mpan_core"])
     headers["mpan_core"] = mpan_core
     units = CONSUMPTION_UNITS_LOOKUP[parts["units"].strip()]
-    if units == "kWh":
+    register_code = parts["register_code"].strip()
+    if units == "kWh" and not register_code.startswith("NOCHARGE"):
         headers["kwh"] += Decimal(parts["quantity"])
 
     prev_read_date_str = parts["prev_read_date"].strip()

chellow/e/computer.py

@@ -993,7 +993,10 @@ class SupplySource(DataSource):
             else:
                 self.llfc = era.imp_llfc
 
-            self.sc = era.imp_sc
+            if "imp_sc" in self.era_map:
+                self.sc = self.era_map["imp_sc"]
+            else:
+                self.sc = era.imp_sc
             self.supplier_account = era.imp_supplier_account
 
             if era.imp_supplier_contract.id in self.era_map_supplier_contracts:
@@ -1020,7 +1023,10 @@ class SupplySource(DataSource):
             else:
                 self.llfc = era.exp_llfc
 
-            self.sc = 0 if era.exp_sc is None else era.exp_sc
+            if "exp_sc" in self.era_map:
+                self.sc = self.era_map["exp_sc"]
+            else:
+                self.sc = era.exp_sc
             self.supplier_account = era.exp_supplier_account
 
             if era.exp_supplier_contract is None:

chellow/templates/e/scenario_docs.html

@@ -83,7 +83,8 @@
         "new_export": 3,
         9: 51
       },
-      "sc": 400,
+      "imp_sc": 400,
+      "exp_sc": 400,
       "mpan_cores": {
         "22 8679 7237 782": "20 7568 7217 378"
       }

{chellow-1728986476.0.0.dist-info → chellow-1729012049.0.0.dist-info}/METADATA

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

@@ -20,7 +20,7 @@ chellow/e/bmarketidx.py,sha256=C0BaHn2RxIuWH2QzA-OmSP0fbUGvW9tqEUhLnzOEdmA,7968
 chellow/e/bsuos.py,sha256=hdP9vnOJSuZl46OAkJeUg1XJYvYIBj4J6Sqce1Hy9Vs,15542
 chellow/e/ccl.py,sha256=30dh_SvlgzsTQPPAJNZWILaMvbeDsv9-P-S1JxS5_SQ,3184
 chellow/e/cfd.py,sha256=Gm435c42LFwZx1n-1UY1Tdx6mL1is7E0vRLWQe8RPOo,14184
-chellow/e/computer.py,sha256=CoYf9SA8zrh1NP_S1jKsfXsaBm5kFcjBbtPUJnx8M9A,67274
+chellow/e/computer.py,sha256=24aBfC-aYoTseRwQSNRAb1PwTKp0zL9aispceL8drcU,67469
 chellow/e/dno_rate_parser.py,sha256=A5TP6KjyfT5lVWh7dX4SiXRi6wnf2lGv-H_T4Sod8CI,21731
 chellow/e/duos.py,sha256=nwviRjz-qIt3GxIMHk0hItIT4dtKsxOWq9TUC1z-hO8,30864
 chellow/e/elexon.py,sha256=ALhXS9Es7PV0z9ukPbIramn3cf3iLyFi-PMWPSm5iOs,5487
@@ -55,7 +55,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=hlMglK7UvVJs0AgHe3uWxcOSPuVVjt-29Xhlj3CvN4E,9942
+chellow/e/bill_parsers/mm.py,sha256=56_nfXNrt_ZZRwoHnj5xTi6Emh9I2wY4JJSaNxmwcCc,10038
 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
@@ -278,7 +278,7 @@ chellow/templates/e/read_type.html,sha256=volKteZB79famXrzN_Bgqy9JT9C4a50vXLkuZ0
 chellow/templates/e/read_types.html,sha256=CknHXNEkBnsAprqI66ftvnnMFBdR_kqI7o26rxjlrJA,473
 chellow/templates/e/scenario.html,sha256=E8o3WQwAEejzaMPzeuUqyt9fWWNSDtN96qkJz0slDEo,1522
 chellow/templates/e/scenario_add.html,sha256=qQpxvhlrQqrNYiIQTHu_NvSoeSKuRNEJQYwLqRlQ8_U,516
-chellow/templates/e/scenario_docs.html,sha256=-aFljSJhiOEKaAb0omOo9kDjnwMarEaFNo-dSYoiwLc,4946
+chellow/templates/e/scenario_docs.html,sha256=QxcX30Y0EJ0KDH0OBZs91a48FSehUEpT8qT1QhuXnRk,4971
 chellow/templates/e/scenario_edit.html,sha256=Uf64v_qsBP0BxaFEIz214CC_dZXlvro4zvQXH_towhA,1070
 chellow/templates/e/scenarios.html,sha256=zlNhZvQEcuwLgHObVHS-4THur5Lz9Jf1G6xD98-jamI,847
 chellow/templates/e/site_add_e_supply.html,sha256=_gi1ejI4TMTMX9vCW7z2kToR2XKR6qoVh67qp_VrDsM,2731
@@ -369,6 +369,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-1728986476.0.0.dist-info/METADATA,sha256=Ok78n_Nora0YJLcFiP8BesoLcDRKSM8OKZWHFjMZ-Tk,12204
-chellow-1728986476.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1728986476.0.0.dist-info/RECORD,,
+chellow-1729012049.0.0.dist-info/METADATA,sha256=KGncQBfTFXII_d4142UqVWnPjzQDIkmVbxHvd9Bj9-Y,12204
+chellow-1729012049.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1729012049.0.0.dist-info/RECORD,,