chellow 1734005435.0.0__py3-none-any.whl → 1737970902.0.0__py3-none-any.whl

chellow/e/bill_parsers/edf_export_xlsx.py

@@ -7,7 +7,7 @@ from openpyxl import load_workbook
 
 from werkzeug.exceptions import BadRequest
 
-from chellow.utils import HH, ct_datetime, parse_mpan_core, to_ct, to_utc
+from chellow.utils import c_months_u, ct_datetime, parse_mpan_core, to_ct, to_utc
 
 
 def get_cell(sheet, col, row):
@@ -83,9 +83,72 @@ ELEM_LOOKUP = {
         "units": "duos-red-kwh",
         "rate": "duos-red-gbp-per-kwh",
     },
+    "Unit Rate Super Red": {
+        "name": "duos-super-red",
+        "gbp": "duos-super-red-gbp",
+        "units": "duos-super-red-kwh",
+        "rate": "duos-super-red-gbp-per-kwh",
+    },
 }
 
 
+def _parse_gduos_sheet(sheet, mpan_core, issue_date):
+    bills = []
+    for row in range(2, len(sheet["A"]) + 1):
+        val = get_cell(sheet, "A", row).value
+        if val is None or val == "":
+            break
+
+        start_date_str = get_str(sheet, "B", row)
+        start_date_ct = to_ct(Datetime.strptime(start_date_str, "%Y-%m"))
+        start_date, finish_date = next(
+            c_months_u(
+                start_year=start_date_ct.year, start_month=start_date_ct.month, months=1
+            )
+        )
+
+        element_desc = get_str(sheet, "D", row).strip()
+        units = get_dec(sheet, "E", row)
+        rate = get_dec(sheet, "F", row)
+        net = round(get_dec(sheet, "G", row), 2)
+
+        titles = ELEM_LOOKUP[element_desc]
+        if titles is None:
+            continue
+
+        breakdown = {
+            titles["gbp"]: net,
+            titles["units"]: units,
+            titles["rate"]: [rate],
+        }
+        bill = {
+            "bill_type_code": "N",
+            "kwh": Decimal(0),
+            "vat": Decimal("0.00"),
+            "net": net,
+            "gross": net,
+            "reads": [],
+            "breakdown": breakdown,
+            "account": mpan_core,
+            "issue_date": issue_date,
+            "start_date": start_date,
+            "finish_date": finish_date,
+            "mpan_core": mpan_core,
+            "reference": "_".join(
+                (
+                    to_ct(start_date).strftime("%Y%m%d"),
+                    to_ct(finish_date).strftime("%Y%m%d"),
+                    to_ct(issue_date).strftime("%Y%m%d"),
+                    mpan_core,
+                    titles["name"],
+                )
+            ),
+        }
+
+        bills.append(bill)
+    return bills
+
+
 def _make_raw_bills(book):
     bills = []
     sheet = book.worksheets[0]
@@ -135,56 +198,8 @@ def _make_raw_bills(book):
         }
     )
     sheet = book.worksheets[3]
-    for row in range(2, len(sheet["A"]) + 1):
-        val = get_cell(sheet, "A", row).value
-        if val is None or val == "":
-            break
-
-        start_date_str = get_str(sheet, "B", row)
-        start_date_ct = to_ct(Datetime.strptime(start_date_str, "%Y-%m"))
-        start_date = to_utc(start_date_ct)
-        finish_date = to_utc(start_date_ct + relativedelta(months=1) - HH)
-
-        element_desc = get_str(sheet, "D", row).strip()
-        units = get_dec(sheet, "E", row)
-        rate = get_dec(sheet, "F", row)
-        net = round(get_dec(sheet, "G", row), 2)
-
-        titles = ELEM_LOOKUP[element_desc]
-        if titles is None:
-            continue
+    bills.extend(_parse_gduos_sheet(sheet, mpan_core, issue_date))
 
-        breakdown = {
-            titles["gbp"]: net,
-            titles["units"]: units,
-            titles["rate"]: [rate],
-        }
-
-        bills.append(
-            {
-                "bill_type_code": "N",
-                "kwh": Decimal(0),
-                "vat": Decimal("0.00"),
-                "net": net,
-                "gross": net,
-                "reads": [],
-                "breakdown": breakdown,
-                "account": mpan_core,
-                "issue_date": issue_date,
-                "start_date": start_date,
-                "finish_date": finish_date,
-                "mpan_core": mpan_core,
-                "reference": "_".join(
-                    (
-                        to_ct(start_date).strftime("%Y%m%d"),
-                        to_ct(finish_date).strftime("%Y%m%d"),
-                        to_ct(issue_date).strftime("%Y%m%d"),
-                        mpan_core,
-                        titles["name"],
-                    )
-                ),
-            }
-        )
     return bills
 
 

chellow/e/bill_parsers/mm.py

@@ -114,6 +114,7 @@ ELEMENT_LOOKUP = {
     "20RS0050": "duos-amber",
     "30RS0050": "duos-red",
     "9CANNUAL": "duos-reactive",
+    "40RS0050": "duos-super-red",
 }
 
 
@@ -186,7 +187,9 @@ def _handle_0461(headers, pre_record, record):
     headers["mpan_core"] = mpan_core
     units = CONSUMPTION_UNITS_LOOKUP[parts["units"].strip()]
     register_code = parts["register_code"].strip()
-    if units == "kWh" and not register_code.startswith("NOCHARGE"):
+    if units == "kWh" and not (
+        register_code.startswith("NOCHARGE") or register_code.endswith("XXXX")
+    ):
         headers["kwh"] += Decimal(parts["quantity"])
 
     prev_read_date_str = parts["prev_read_date"].strip()

chellow/templates/e/supply.html

@@ -218,8 +218,6 @@
 				{{ input_number('months', initial='1', size='2', maxlength='2', required=True) }}
 				<label>Final Month</label>
 				{{ input_date('finish', last_month_finish, 'month') }}
-				<label>Include bill check tabs?</label>
-				{{input_checkbox('is_bill_check')}}
 				<input type="submit" value="Download">
 			</fieldset>
 		</form>

chellow/templates/g/supply.html

@@ -366,10 +366,8 @@
 		<fieldset>
 			<input type="hidden" name="g_supply_id" value="{{g_supply.id}}">
 			<legend>Monthly Duration</legend>
-			<br>
-			For <input name="months" maxlength="2" size="2" value="1">
-			month(s) finishing at the end of
-			{{ input_date('finish', last_month_finish, 'month') }}
+			<label>Months Long</label> <input name="months" maxlength="2" size="2" value="1">
+			<label>Last Month</label> {{ input_date('finish', last_month_finish, 'month') }}
 			<input type="submit" value="Download">
 		</fieldset>
 	</form>

{chellow-1734005435.0.0.dist-info → chellow-1737970902.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: chellow
-Version: 1734005435.0.0
+Version: 1737970902.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-1734005435.0.0.dist-info → chellow-1737970902.0.0.dist-info}/RECORD

@@ -49,7 +49,7 @@ chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=UgWXDPzQkQghyj_lfgBqoSJ
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3vd2HLeQU_4P0iBUd3WA,4219
 chellow/e/bill_parsers/bgb_edi.py,sha256=GuwHeYbAGk7BVg5n19FcTANFDyKI-y0z3f9niQaPSSw,4828
 chellow/e/bill_parsers/csv.py,sha256=U5zcIaZ6B5QTTpFDAcBnk4G2r8B3j5kJhDPL4AJNkEk,5640
-chellow/e/bill_parsers/edf_export_xlsx.py,sha256=t-M9-dGNWXu3VDI1DbS5Ez1oHW33oopJryNgMTvTjys,6307
+chellow/e/bill_parsers/edf_export_xlsx.py,sha256=J4lY8epiSTIePZ6D1SGD76TXRoev35KrUC2sjHkNqlE,6632
 chellow/e/bill_parsers/engie_edi.py,sha256=CTobTskDjzdcqqf_qk2ukDSaTLrVpGZMM0sYlwehog4,14985
 chellow/e/bill_parsers/engie_export_xlsx.py,sha256=oZO0qHdDlOxjJ6J5Ate82CkAoX4bxed1EJyUKHxBcpk,4690
 chellow/e/bill_parsers/engie_xls.py,sha256=jrut2heH_ZWmSjcn7celOydZS9Y49GfpYjDk_EKwamI,14453
@@ -58,7 +58,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=CdYVV3OI-BCtpd9PohOPkY3127dhz0wOCtXOLCDRVsw,10724
+chellow/e/bill_parsers/mm.py,sha256=5909bJe_zwRItqkMYnq5bdZA6XhBBMquvBqsC6bbnqU,10808
 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
@@ -320,7 +320,7 @@ chellow/templates/e/supplier_contracts.html,sha256=VwWD4q88Fynz7vioFSAsyH6RR_1Sy
 chellow/templates/e/supplier_rate_script.html,sha256=tjWeCUAgNip3VLHzbXqe19Msiasys3Wm5Vra936qJjI,1245
 chellow/templates/e/supplier_rate_script_add.html,sha256=Yf2LZEIHbL7qT6oxBCtPf0ZX7vJsSo_ZeOKJhJoVh3o,690
 chellow/templates/e/supplier_rate_script_edit.html,sha256=VaYJt8nxHdnuP-zEAuBJC-ibEpjDU1b80hXtdBQH1dg,1968
-chellow/templates/e/supply.html,sha256=No26xivLm4hA8kRufVvPjrEOE3of7pmZaW_jgTcKSY0,8511
+chellow/templates/e/supply.html,sha256=kFyYPIzMgRZz7tHY_TfmjYzUkc1zXyaJses6X372Ozg,8427
 chellow/templates/e/supply_edit.html,sha256=2BRGU35nb0ZpUHKCi_fgAPMU6SlHI7ve3_Ne8LXHtms,2333
 chellow/templates/e/supply_eras.html,sha256=5lB7_oC-sTWRQoASuPgBWj5XSZa9ajR0s6V6xKHvf6E,19996
 chellow/templates/e/supply_hh_data.html,sha256=d9ho4Tq3ZkR5GmxSZr_zHGwCU68PH3aSc4OwFG9i9zE,3587
@@ -369,13 +369,13 @@ chellow/templates/g/supplier_rate_script.html,sha256=e4dwskWTQcLv6qyX150VUeuaUvE
 chellow/templates/g/supplier_rate_script_add.html,sha256=zMjTkjupOsHFu-peUXL4IKjjc2OaSL-2ah4T9OdKp_o,620
 chellow/templates/g/supplier_rate_script_edit.html,sha256=GoUqXf52gWEH1iApmNdxOcKLItzpA-o7iQPQ1_in9BA,1950
 chellow/templates/g/supplies.html,sha256=oEAEfZaAuKv7EA6fd3blWjPwv_XKoNHLPlkRJ_afZHs,1267
-chellow/templates/g/supply.html,sha256=HMR2haS4-k24rGqWApA74Ufi_IODN0oNIa9d7L9Xe1o,11001
+chellow/templates/g/supply.html,sha256=eWuSDHh8de-LgLVlrNPWLX-_jiRn1uB3CZNpGK1xBYA,11006
 chellow/templates/g/supply_edit.html,sha256=F2Ip4xCXLl4eFiRjMLZyUMIiznWw97GF7mN_50QAEWA,1653
 chellow/templates/g/supply_note_add.html,sha256=zWwppQTxBfN7Dw6Cgr330mw7SgDRoTcaIdAucNisZRE,658
 chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1nAPevz-AgkhQ,1036
 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-1734005435.0.0.dist-info/METADATA,sha256=rikcxSjkW6hkiNWM_zQJBT9tqQUz1C0JhNytTqShEdk,12204
-chellow-1734005435.0.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-chellow-1734005435.0.0.dist-info/RECORD,,
+chellow-1737970902.0.0.dist-info/METADATA,sha256=-PX-L_InK77KEH_JUnv2jKfvvmY1VKsDdHOZsJWuj5Y,12204
+chellow-1737970902.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1737970902.0.0.dist-info/RECORD,,

{chellow-1734005435.0.0.dist-info → chellow-1737970902.0.0.dist-info}/WHEEL

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