chellow 1715955542.0.0__py3-none-any.whl → 1716370405.0.0__py3-none-any.whl

chellow/gas/{bill_parser_edi.py → bill_parser_total_edi.py}

@@ -12,27 +12,11 @@ from chellow.utils import HH, to_ct, to_utc
 
 READ_TYPE_MAP = {"00": "A", "01": "E", "02": "E"}
 
-TCOD_MAP = {
-    "Energy Bill Discount Scheme": {"PPK": "ebrs"},
-    "Energy Bill Relief Scheme": {"PPK": "ebrs"},
-    "Energy Bill Relief Scheme Discount": {"PPK": "ebrs"},
-    "Unidentified Gas": {"PPK": "ug"},
-    "Commodity": {"PPK": "commodity"},
-    "Transportation": {"PPD": "transportation_fixed", "PPK": "transportation_variable"},
-    "Gas Flexi": {"PPK": "commodity"},
-    "Flex - Gas Flexi (New)": {"PPK": "commodity"},
-    "Meter Reading": {"PPD": "meter_read"},
-    "Meter Reading Credit Oct 19": {"FIX": "meter_read"},
-    "Meter Rental": {"PPD": "metering"},
-    "CCL": {"PPK": "ccl"},
-    "Consumption Based Administration": {"PPK": "admin_variable"},
-    "Swing": {"PPK": "swing"},
-}
 
 SUPPLIER_CODE_MAP = {
-    "STD": "standing",
-    "MET": "commodity",
-    "CCL": "ccl",
+    "STD": ("standing", Decimal("1000"), Decimal("1")),
+    "MET": ("commodity", Decimal("100000"), Decimal("1000")),
+    "CCL": ("ccl", Decimal("100000"), Decimal("1000")),
 }
 
 UNIT_MAP = {"M3": "M3", "HH": "HCUF", "HCUF": "HCUF"}
@@ -62,16 +46,6 @@ def _process_BCD(elements, headers):
     btcd = elements["BTCD"]
     headers["bill_type_code"] = btcd[0]
 
-    sumo = elements["SUMO"]
-    start_date = to_date(sumo[0])
-    if start_date is not None:
-        headers["start_date"] = start_date
-
-    if len(sumo) > 1:
-        finish_date = _to_finish_date(sumo[1])
-        if finish_date is not None:
-            headers["finish_date"] = finish_date
-
 
 def _process_MHD(elements, headers):
     headers.clear()
@@ -88,62 +62,12 @@ def _process_MHD(elements, headers):
         headers["gross"] = Decimal("0.00")
 
 
-def _process_CCD1(elements, headers):
-    mtnr = elements["MTNR"]
-    msn = mtnr[0]
-
-    mloc = elements["MLOC"]
-
-    # Bug in EDI where MPRN missing in second CCD 1
-    if "mprn" not in headers:
-        headers["mprn"] = mloc[0]
-
-    prdt = elements["PRDT"]
-    pvdt = elements["PVDT"]
-
-    pres_read_date = to_date(prdt[0])
-    prev_read_date = to_date(pvdt[0])
-
-    prrd = elements["PRRD"]
-    pres_read_value = Decimal(prrd[0])
-    pres_read_type = READ_TYPE_MAP[prrd[1]]
-    prev_read_value = Decimal(prrd[2])
-    prev_read_type = READ_TYPE_MAP[prrd[3]]
-
-    conb = elements["CONB"]
-    unit = UNIT_MAP[conb[1]]
-    headers["breakdown"]["units_consumed"] += to_decimal(conb) / Decimal("1000")
-
-    adjf = elements["ADJF"]
-    correction_factor = Decimal(adjf[1]) / Decimal(100000)
-
-    nuct = elements["NUCT"]
-
-    headers["kwh"] += to_decimal(nuct) / Decimal("1000")
-
-    headers["reads"].append(
-        {
-            "msn": msn,
-            "unit": unit,
-            "correction_factor": correction_factor,
-            "prev_date": prev_read_date,
-            "prev_value": prev_read_value,
-            "prev_type_code": prev_read_type,
-            "pres_date": pres_read_date,
-            "pres_value": pres_read_value,
-            "pres_type_code": pres_read_type,
-        }
-    )
-
-
 NUCT_LOOKUP = {"DAY": "days", "KWH": "kwh"}
 
 
 def _process_CCD2(elements, headers):
     breakdown = headers["breakdown"]
     ccde = elements["CCDE"]
-    ccde_supplier_code = ccde[2]
-    tcod = elements["TCOD"]
     nuct = elements["NUCT"]
     mtnr = elements["MTNR"]
     conb = elements["CONB"]
@@ -151,57 +75,45 @@ def _process_CCD2(elements, headers):
     prdt = elements["PRDT"]
     pvdt = elements["PVDT"]
     prrd = elements["PRRD"]
+    cppu = elements["CPPU"]
+    ctot = elements["CTOT"]
+    csdt = elements["CSDT"]
+    cedt = elements["CEDT"]
+    mloc = elements["MLOC"]
 
-    if len(tcod) > 1:
-        tpref_lookup = TCOD_MAP[tcod[1]]
-    else:
-        tpref_lookup = SUPPLIER_CODE_MAP
+    ccde_supplier_code = ccde[2]
+    tpref, rate_divisor, units_divisor = SUPPLIER_CODE_MAP[ccde_supplier_code]
 
-    tpref = tpref_lookup[ccde_supplier_code]
+    rate_str = cppu[0]
 
-    bpri = elements["BPRI"]
-    if len(bpri[0]) > 0:
-        rate_key = f"{tpref}_rate"
-        if rate_key not in breakdown:
-            breakdown[rate_key] = set()
-        rate = Decimal(bpri[0]) / Decimal("10000000")
-        breakdown[rate_key].add(rate)
+    rate_key = f"{tpref}_rate"
+    if rate_key not in breakdown:
+        breakdown[rate_key] = set()
+    rate = Decimal(rate_str) / rate_divisor
+    breakdown[rate_key].add(rate)
 
-    try:
-        ctot = elements["CTOT"]
-        breakdown[f"{tpref}_gbp"] += to_decimal(ctot) / Decimal("100")
-
-        if len(nuct) > 1:
-            key = NUCT_LOOKUP[nuct[1]]
-        else:
-            if ccde_supplier_code == "PPK":
-                key = f"{tpref}_kwh"
-            elif ccde_supplier_code == "PPD":
-                key = f"{tpref}_days"
-
-        breakdown[key] += to_decimal(nuct) / Decimal("1000")
-    except KeyError:
-        pass
+    breakdown[f"{tpref}_gbp"] += to_decimal(ctot) / Decimal("100")
+
+    suff = NUCT_LOOKUP[nuct[1].strip()]
+    key = f"{tpref}_{suff}"
+    units_billed = to_decimal(nuct) / units_divisor
+    breakdown[key] += units_billed
 
     if "start_date" not in headers:
-        csdt = elements["CSDT"]
-        start_date = to_date(csdt[0])
-        if start_date is not None:
-            headers["start_date"] = start_date
+        headers["start_date"] = to_date(csdt[0])
 
     if "finish_date" not in headers:
-        cedt = elements["CSDT"]
-        finish_date = _to_finish_date(cedt[0])
-        if finish_date is not None:
-            headers["finish_date"] = finish_date
+        headers["finish_date"] = _to_finish_date(cedt[0])
 
     if "mprn" not in headers:
-        mloc = elements["MLOC"]
         headers["mprn"] = mloc[0]
 
     if len(conb) > 0 and len(conb[0]) > 0:
         headers["breakdown"]["units_consumed"] += to_decimal(conb) / Decimal("1000")
 
+    if tpref == "commodity":
+        headers["kwh"] += units_billed
+
     if len(prrd) > 0 and len(prrd[0]) > 0:
         pres_read_date = to_date(prdt[0])
         prev_read_date = to_date(pvdt[0])
@@ -229,70 +141,6 @@ def _process_CCD2(elements, headers):
         )
 
 
-def _process_CCD3(elements, headers):
-    breakdown = headers["breakdown"]
-    ccde = elements["CCDE"]
-    ccde_supplier_code = ccde[2]
-    tcod = elements["TCOD"]
-
-    tpref = TCOD_MAP[tcod[1]][ccde_supplier_code]
-
-    bpri = elements["BPRI"]
-    bpri_str = bpri[0]
-    if len(bpri_str) > 0:
-        rate_key = f"{tpref}_rate"
-        if rate_key not in breakdown:
-            breakdown[rate_key] = set()
-        rate = Decimal(bpri_str) / Decimal("10000000")
-        breakdown[rate_key].add(rate)
-
-    nuct = elements["NUCT"]
-
-    try:
-        ctot = elements["CTOT"]
-        breakdown[f"{tpref}_gbp"] += to_decimal(ctot) / Decimal("100")
-
-        if ccde_supplier_code == "PPK":
-            key = f"{tpref}_kwh"
-        elif ccde_supplier_code == "PPD":
-            key = f"{tpref}_days"
-
-        breakdown[key] += to_decimal(nuct) / Decimal("1000")
-    except KeyError:
-        pass
-
-
-def _process_CCD4(elements, headers):
-    breakdown = headers["breakdown"]
-    ccde = elements["ccde"]
-    ccde_supplier_code = ccde[2]
-    tcod = elements["TCOD"]
-
-    tpref = TCOD_MAP[tcod[1]][ccde_supplier_code]
-
-    bpri = elements["BPRI"]
-    rate_key = f"{tpref}_rate"
-    if rate_key not in breakdown:
-        breakdown[rate_key] = set()
-    rate = Decimal(bpri[0]) / Decimal("10000000")
-    breakdown[rate_key].add(rate)
-
-    nuct = elements["NUCT"]
-
-    try:
-        ctot = elements["CTOT"]
-        breakdown[tpref + "_gbp"] += to_decimal(ctot) / Decimal("100")
-
-        if ccde_supplier_code == "PPK":
-            key = f"{tpref}_kwh"
-        elif ccde_supplier_code == "PPD":
-            key = f"{tpref}_days"
-
-        breakdown[key] += to_decimal(nuct) / Decimal("1000")
-    except KeyError:
-        pass
-
-
 def _process_MTR(elements, headers):
     if headers["message_type"] == "UTLBIL":
         breakdown = headers["breakdown"]
@@ -357,10 +205,10 @@ CODE_FUNCS = {
     "ADJ": _process_ADJ,
     "BCD": _process_BCD,
     "BTL": _process_NOOP,
-    "CCD1": _process_CCD1,
+    "CCD1": _process_NOOP,
     "CCD2": _process_CCD2,
-    "CCD3": _process_CCD3,
-    "CCD4": _process_CCD4,
+    "CCD3": _process_NOOP,
+    "CCD4": _process_NOOP,
     "CDT": _process_NOOP,
     "CLO": _process_NOOP,
     "END": _process_NOOP,

chellow/gas/engine.py

@@ -502,13 +502,6 @@ class GDataSource:
                 * h["calorific_value"]
                 / 3.6
             )
-            h["kwh_avg"] = (
-                h["units_consumed"]
-                * h["unit_factor"]
-                * h["correction_factor"]
-                * h["avg_cv"]
-                / 3.6
-            )
             h["ug_rate"] = float(
                 g_rates(sess, self.caches, "ug", h["start_date"], True)[
                     "ug_gbp_per_kwh"
@@ -703,9 +696,7 @@ def find_cv(sess, caches, dt, g_ldz_code):
             avg_cv = year_cache[ct.month]
         except KeyError:
             cv_list = [float(v["cv"]) for v in cvs.values()]
-            avg_cv = year_cache[ct.month] = round(
-                sum(cv_list) / len(cv_list), ndigits=1
-            )
+            avg_cv = year_cache[ct.month] = sum(cv_list) / len(cv_list)
     return cv, avg_cv
 
 

chellow/gas/views.py

@@ -289,15 +289,37 @@ def supply_edit_get(g_supply_id):
     )
 
 
+@gas.route("/supplies/<int:g_supply_id>/edit", methods=["DELETE"])
+def supply_edit_delete(g_supply_id):
+    g_supply = GSupply.get_by_id(g.sess, g_supply_id)
+    try:
+        g_supply.delete(g.sess)
+        g.sess.commit()
+        return hx_redirect("/supplies")
+    except BadRequest as e:
+        flash(e.description)
+        g_eras = g.sess.scalars(
+            select(GEra)
+            .where(GEra.g_supply == g_supply)
+            .order_by(GEra.start_date.desc())
+        )
+        g_exit_zones = g.sess.query(GExitZone).order_by(GExitZone.code).all()
+        return make_response(
+            render_template(
+                "supply_edit.html",
+                g_supply=g_supply,
+                g_eras=g_eras,
+                g_exit_zones=g_exit_zones,
+            ),
+            400,
+        )
+
+
 @gas.route("/supplies/<int:g_supply_id>/edit", methods=["POST"])
 def supply_edit_post(g_supply_id):
     g_supply = GSupply.get_by_id(g.sess, g_supply_id)
     try:
-        if "delete" in request.values:
-            g_supply.delete(g.sess)
-            g.sess.commit()
-            return chellow_redirect("/supplies", 303)
-        elif "insert_g_era" in request.values:
+        if "insert_g_era" in request.values:
             start_date = req_date("start")
             g_supply.insert_g_era_at(g.sess, start_date)
             g.sess.commit()

chellow/reports/report_59.py

@@ -486,7 +486,45 @@ def _process_site(
                     .all()
                 )
                 if len(bills) > 0:
-                    month_data = {}
+                    imp_supplier_contract = last_era.imp_supplier_contract
+                    imp_supplier_contract_name = (
+                        None
+                        if imp_supplier_contract is None
+                        else imp_supplier_contract.name
+                    )
+                    exp_supplier_contract = last_era.exp_supplier_contract
+                    exp_supplier_contract_name = (
+                        None
+                        if exp_supplier_contract is None
+                        else exp_supplier_contract.name
+                    )
+                    era_associates = {
+                        s.site.code for s in last_era.site_eras if not s.is_physical
+                    }
+                    vals = {
+                        "creation-date": now,
+                        "start-date": chunk_start,
+                        "finish-date": chunk_finish,
+                        "imp-mpan-core": last_era.imp_mpan_core,
+                        "exp-mpan-core": last_era.exp_mpan_core,
+                        "site-code": site.code,
+                        "site-name": site.name,
+                        "associated-site-codes": era_associates,
+                        "era-start-date": None,
+                        "era-finish-date": None,
+                        "imp-supplier-contract": imp_supplier_contract_name,
+                        "imp-non-actual-hhs": None,
+                        "imp-non-actual-kwh": None,
+                        "exp-supplier-contract": exp_supplier_contract_name,
+                        "exp-non-actual-hhs": None,
+                        "exp-non-actual-kwh": None,
+                        "metering-type": last_era.meter_category,
+                        "source": last_era.supply.source.code,
+                        "generator-type": None,
+                        "supply-name": last_era.supply.name,
+                        "msn": last_era.msn,
+                        "pc": last_era.pc.code,
+                    }
                     for name in (
                         "import-net",
                         "export-net",
@@ -500,10 +538,10 @@ def _process_site(
                         "billed-import-net",
                     ):
                         for sname in ("kwh", "gbp"):
-                            month_data[name + "-" + sname] = 0
-                    month_data["billed-supplier-import-net-gbp"] = 0
-                    month_data["billed-dc-import-net-gbp"] = 0
-                    month_data["billed-mop-import-net-gbp"] = 0
+                            vals[name + "-" + sname] = 0
+                    vals["billed-supplier-import-net-gbp"] = 0
+                    vals["billed-dc-import-net-gbp"] = 0
+                    vals["billed-mop-import-net-gbp"] = 0
 
                     for bill in bills:
                         bill_role_code = bill.batch.contract.market_role.code
@@ -528,42 +566,12 @@ def _process_site(
                         else:
                             raise BadRequest("Role code not recognized.")
 
-                        for data in month_data, site_data:
+                        for data in vals, site_data:
                             data["billed-import-net-kwh"] += bill_prop_kwh
                             data["billed-import-net-gbp"] += bill_prop_gbp
                             data[key] += bill_prop_gbp
 
-                    imp_supplier_contract = last_era.imp_supplier_contract
-                    exp_supplier_contract = last_era.exp_supplier_contract
-                    out = [
-                        now,
-                        last_era.imp_mpan_core,
-                        (
-                            None
-                            if imp_supplier_contract is None
-                            else imp_supplier_contract.name
-                        ),
-                        last_era.exp_mpan_core,
-                        (
-                            None
-                            if exp_supplier_contract is None
-                            else exp_supplier_contract.name
-                        ),
-                        chunk_start,
-                        last_era.meter_category,
-                        last_era.supply.source.code,
-                        None,
-                        last_era.supply.name,
-                        last_era.msn,
-                        last_era.pc.code,
-                        site.code,
-                        site.name,
-                        None,
-                        start_date,
-                        finish_date,
-                    ] + [month_data[t] for t in summary_titles]
-
-                    era_rows.append([make_val(v) for v in out])
+                    era_rows.append([make_val(vals.get(t)) for t in era_titles])
         first_era = (
             sess.execute(
                 select(Era).where(Era.supply == supply).order_by(Era.start_date)

chellow/templates/g/bill_import.html

@@ -45,6 +45,7 @@
 					<th>Issue Date</th>
 					<th>Start Date</th>
 					<th>Finish Date</th>
+					<th>kWh</th>
 					<th>Net GBP</th>
 					<th>VAT</th>
 					<th>Gross GBP</th>
@@ -72,6 +73,7 @@
 						<td>{{bill.issue_date|hh_format}}</td>
 						<td>{{bill.start_date|hh_format}}</td>
 						<td>{{bill.finish_date|hh_format}}</td>
+						<td>{{bill.kwh}}</td>
 						<td>{{bill.net_gbp}}</td>
 						<td>{{bill.vat_gbp}}</td>
 						<td>{{bill.gross_gbp}}</td>

chellow/templates/g/supply_edit.html

@@ -10,67 +10,53 @@
 {% endblock %}
 
 {% block content %}
-	{% if request.method == 'GET' and request.values.delete %}
-		<form method="post" action="/g/supplies/{{g_supply.id}}/edit">
-			<fieldset>
-				<legend>Delete</legend>
-				<p>Are you sure you want to delete this supply?</p>
-				<input type="submit" name="delete" value="Delete">
-			</fieldset>
-		</form>
+	<form method="post" action="/g/supplies/{{g_supply.id}}/edit">
+		<fieldset>
+			<legend>Update this supply</legend>
+			<label>Name</label> {{input_text('name', g_supply.name)}}
+			<label>MPRN</label> {{input_text('mprn', g_supply.mprn)}}
+			<label>Exit Zone</label>
+			<select name="g_exit_zone_id">
+				{% for g_exit_zone in g_exit_zones %}
+					{{input_option(
+						'g_exit_zone_id', g_exit_zone.id, g_exit_zone.code, initial=g_supply.g_exit_zone.id)}}
+				{% endfor %}
+			</select>
+			<input type="submit" value="Update">
+		</fieldset>
+	</form>
 
-		<p>
-			<a href="/g/supplies/{{g_supply.id}}">Cancel</a>
-		</p>
+	<form hx-delete="/g/supplies/{{g_supply.id}}/edit"
+			hx-confirm="Are you sure you want to delete this supply?">
+		<fieldset>
+			<legend>Delete this supply</legend>
+			<input type="submit" value="Delete">
+		</fieldset>
+	</form>
 
-	{% else %}
+	<form method="post" action="/g/supplies/{{g_supply.id}}/edit">
+		<fieldset>
+			<legend>Insert a new era</legend>
+			<label>Start date</label> {{input_date('start', None)}}
+			<input type="submit" name="insert_g_era" value="Insert">
+		</fieldset>
+	</form>
 
-		<form method="post" action="/g/supplies/{{g_supply.id}}/edit">
-			<fieldset>
-				<legend>Update this supply</legend>
-				<label>Name</label> {{input_text('name', g_supply.name)}}
-				<label>MPRN</label> {{input_text('mprn', g_supply.mprn)}}
-				<label>Exit Zone</label>
-				<select name="g_exit_zone_id">
-					{% for g_exit_zone in g_exit_zones %}
-						{{input_option( 'g_exit_zone_id', g_exit_zone.id, g_exit_zone.code)}}
-					{% endfor %}
-				</select>
-				<input type="submit" value="Update">
-			</fieldset>
-		</form>
-		<br>
-		<form action="/g/supplies/{{g_supply.id}}/edit">
-			<fieldset>
-				<legend>Delete this supply</legend>
-				<input type="submit" name="delete" value="Delete">
-			</fieldset>
-		</form>
-		<br>
-		<form method="post" action="/g/supplies/{{g_supply.id}}/edit">
-			<fieldset>
-				<legend>Insert a new era</legend>
-				<label>Start date</label> {{input_date('start', None)}}
-				<input type="submit" name="insert_g_era" value="Insert">
-			</fieldset>
-		</form>
-		<br>
-		<table>
-			<caption>Existing Eras</caption>
-			<thead>
+	<table>
+		<caption>Existing Eras</caption>
+		<thead>
+			<tr>
+				<th>Start date</th>
+				<th>Finish date</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for g_era in g_eras %}
 				<tr>
-					<th>Start date</th>
-					<th>Finish date</th>
+					<td>{{g_era.start_date|hh_format}}</td>
+					<td>{{g_era.finish_date|hh_format}}</td>
 				</tr>
-			</thead>
-			<tbody>
-				{% for g_era in g_eras %}
-					<tr>
-						<td>{{g_era.start_date|hh_format}}</td>
-						<td>{{g_era.finish_date|hh_format}}</td>
-					</tr>
-				{% endfor %}
-			</tbody>
-		</table>
-	{% endif %}
+			{% endfor %}
+		</tbody>
+	</table>
 {% endblock %}

{chellow-1715955542.0.0.dist-info → chellow-1716370405.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1715955542.0.0
+Version: 1716370405.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)
@@ -20,7 +20,7 @@ Requires-Dist: pympler==1.0.1
 Requires-Dist: pypdf==3.17.0
 Requires-Dist: python-dateutil==2.8.2
 Requires-Dist: pytz==2022.6
-Requires-Dist: requests==2.31.0
+Requires-Dist: requests==2.32.2
 Requires-Dist: sqlalchemy==2.0.28
 Requires-Dist: waitress==2.1.2
 Requires-Dist: xlrd==2.0.1

{chellow-1715955542.0.0.dist-info → chellow-1716370405.0.0.dist-info}/RECORD

@@ -58,14 +58,14 @@ chellow/e/bill_parsers/sse_edi.py,sha256=L85DOfNkqexeEIEr8pCBn_2sHJI-zEaw6cogpE3
 chellow/e/bill_parsers/sww_xls.py,sha256=QEjiuvwvr5FuWCfqqVw8LaA_vZyAKsvRAS5fw3xtFhM,7533
 chellow/gas/bill_import.py,sha256=w0lPgK_Drzh8rtnEBQe3qFuxrgzZ6qQSgpaGrrGznMU,6549
 chellow/gas/bill_parser_csv.py,sha256=Ecdy-apFT-mWAxddAsM4k1s-9-FpIaOfjP0oFc0rdQg,5557
-chellow/gas/bill_parser_edi.py,sha256=3PGofkIxfxWG1x5WM7pYFi0tfTmvOuusRxEc-76Zvi0,11484
 chellow/gas/bill_parser_engie_edi.py,sha256=Ko0vZP-QdVQ1uuhS_5cdrii60_cM4b_LFJMoY0pZqnk,8950
+chellow/gas/bill_parser_total_edi.py,sha256=k5b9vadgLdEb8dk1E-mZpcKGyxXh1AWYsNiGSUK5CBA,7172
 chellow/gas/ccl.py,sha256=DMlcPUELZi00CaDekVJINYk3GgH5apFrImVdmkbyba0,2913
 chellow/gas/cv.py,sha256=4cdYYQ8Qak6NeYdBCB4YaQ0jX8-UkaydIIdibCQuXxM,7344
 chellow/gas/dn_rate_parser.py,sha256=Mq8rAcUEUxIQOks59bsCKl8GrefvoHbrTCHqon9N0z0,11340
-chellow/gas/engine.py,sha256=PhaCWDslhEzDmuCu5PMt3IpFANm27OO1bupq3yQCmc0,25518
+chellow/gas/engine.py,sha256=jT7m6vddi5GnWd51wCYEVhBS-LZEn1T9ggZX7Y9HGK0,25263
 chellow/gas/transportation.py,sha256=Bkg8TWOs-v0ES-4qqwbleiOhqbE_t2KauUx9JYMZELM,5300
-chellow/gas/views.py,sha256=0oiQBmhI6egENXdi0CcgjM80BaF0nxptPJvRKJdce_M,56781
+chellow/gas/views.py,sha256=ZIMqByN0uBpf3y9wkMi-VogC1-NaHs-oO7WRVDk9Kkw,57428
 chellow/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/reports/report_109.py,sha256=S8fsOwh-jVWGL0RsgyYLdqn00BAvlkBbi4VfTSGI-Mc,11181
 chellow/reports/report_111.py,sha256=qU5MYPQzZ_cEvuERE8bxq93D-dN1yd4oML6FIqd0Jdk,28278
@@ -84,7 +84,7 @@ chellow/reports/report_33.py,sha256=laVz-itDbJTdvC6LxLEeuY0eKpYx43Un4adiExPTEEE,
 chellow/reports/report_387.py,sha256=KcClrEOK5IRvePp0Jgbzs1Gwf-_CqYmEtFFlXrr_Z3E,5670
 chellow/reports/report_41.py,sha256=QQeTshA1Og7N3wPaoZ8ynJzwsvZ1mgSFc7DDkVqIZoM,7447
 chellow/reports/report_429.py,sha256=0GCc0rQnOSG0fusw69yMMOCxnWApBd3P2sGWIg1py9M,12359
-chellow/reports/report_59.py,sha256=d3qosO0s0y7xsn4i-ZGQLF420Zaax0lYI2KnolIPNi8,44749
+chellow/reports/report_59.py,sha256=CCFPUspUFgoMt6sMFsdtLYW-inA9rN6D-6Kted6vskA,45458
 chellow/reports/report_81.py,sha256=UYr0Dm4TmCCYUbIWw3hWNI0GdQRhH27vwVk3Ytdsrcg,5288
 chellow/reports/report_87.py,sha256=ZadBo40rUORN0Fi926-dDHeTFn6L-fBzp3b4k7v5MdY,6802
 chellow/reports/report_asset_comparison.py,sha256=UN298MHuzyUDUiiZr7F_Ua6SrdVOlFLjgKjnIbrA-14,6118
@@ -327,7 +327,7 @@ chellow/templates/g/batches.html,sha256=mnzLroYfhwvL5gFK1PNtI-vS7GcDtcggNd0E15Sh
 chellow/templates/g/bill.html,sha256=S8moZ06CDl4_nQQgqyy4mdkyhfvgoQJGZS8ppsluT_E,3455
 chellow/templates/g/bill_add.html,sha256=sDSpUgEbdalDsea1Ma5lgVRgtbFf0bZ042jUdOFeDDk,1674
 chellow/templates/g/bill_edit.html,sha256=ynfUR_lZXLgTK3T0x9GjzAHahuR823ykMpjCWrY8ot8,2754
-chellow/templates/g/bill_import.html,sha256=iK8Bn_s_RmWr1noOdZ7f3L-VztyOl23YAnFXLK16x_o,4584
+chellow/templates/g/bill_import.html,sha256=gns_IbE7eynbbchydzLtuJ3SgJU2VXlr5211aqiRhe8,4630
 chellow/templates/g/bill_imports.html,sha256=AHC0l0Wkr1RZ9fdGWTqihOEcn8lTZ63Uh9BHqPxfRCU,3157
 chellow/templates/g/dn.html,sha256=ttEdvFANFUCBV8e9tVrZy35-tzsC9dU-biZhAPxE2Bw,481
 chellow/templates/g/dns.html,sha256=RuxXvQ9eHs6B7nVGHtTbW8pdmSAaMbQw2f_BwiLZptM,403
@@ -358,12 +358,12 @@ chellow/templates/g/supplier_rate_script_add.html,sha256=zMjTkjupOsHFu-peUXL4IKj
 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=Jeqm7AhZQd4uzu-ncRIIeh6DK9NYSvYrLrxmBE4ERIM,10975
-chellow/templates/g/supply_edit.html,sha256=v4HEWn97phGDgkDxi95VJg7mnZ9nF08WtxCAMH7Nbng,2022
+chellow/templates/g/supply_edit.html,sha256=F2Ip4xCXLl4eFiRjMLZyUMIiznWw97GF7mN_50QAEWA,1653
 chellow/templates/g/supply_note_add.html,sha256=npmobg9u1xKcgJKSRCwLY_tH5WJ0bAx3i2XZWqfFeHs,744
 chellow/templates/g/supply_note_edit.html,sha256=6UQf_qbhFDys3cVsTp-c7ABWZpggW9R1rhxRKK3h_p8,1043
 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-1715955542.0.0.dist-info/METADATA,sha256=9p1jWHXcSPCm5spNAJsGfUTL9DSmz_kVMN9Bd36K8Hg,12205
-chellow-1715955542.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-chellow-1715955542.0.0.dist-info/RECORD,,
+chellow-1716370405.0.0.dist-info/METADATA,sha256=TuaScYTcnRt-YAdvw014lKjfOAS9GaelicnQ1FPdkjI,12205
+chellow-1716370405.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+chellow-1716370405.0.0.dist-info/RECORD,,