chellow 1751875889.0.0__py3-none-any.whl → 1751991276.0.0__py3-none-any.whl

chellow/e/bill_parsers/drax_edi.py

@@ -104,6 +104,7 @@ ELEMENT_MAP = {
                 "duos-availability-kva",
             ),
             "209269": ("tnuos-gbp", "tnuos-rate", "tnuos-days"),
+            "065950": ("eii-gbp", "eii-rate", "eii-kwh"),
         },
         "DUSDIS": {
             "122568": ("nrg-gsp-losses-gbp", "nrg-rate", "nrg-gsp-losses-kwh"),
@@ -149,7 +150,6 @@ ELEMENT_MAP = {
     "930504": ("eii-gbp", None, None),
     "331201": ("eii-gbp", None, None),
     "307253": ("eii-gbp", "eii-rate", "eii-kwh"),
-    "065950": ("eii-gbp", "eii-rate", "eii-kwh"),
 }
 
 TPR_LOOKUP = {

chellow/e/bill_parsers/mm.py

@@ -47,7 +47,9 @@ def _handle_0050(headers, pre_record, record):
         unknown_4=12,
         late_payment=12,
     )
-    headers["late_payment"] = Decimal(parts["late_payment"]) / Decimal(100)
+    headers["breakdown"]["late_payment"] += Decimal(parts["late_payment"]) / Decimal(
+        100
+    )
     """
 
 
@@ -57,13 +59,10 @@ def _handle_0051(headers, pre_record, record):
 
 def _handle_0100(headers, pre_record, record):
     issue_date = headers["issue_date"]
-    late_payment = headers.get("late_payment")
     headers.clear()
     headers["issue_date"] = issue_date
-    if late_payment is not None:
-        headers["late_payment"] = late_payment
-    headers["account"] = pre_record[43:52]
-    headers["reference"] = pre_record[41:46]
+    headers["account"] = pre_record[42:52]
+    headers["reference"] = pre_record[52:64]
     headers["kwh"] = Decimal("0")
     headers["breakdown"] = defaultdict(int, {"vat": {}})
     headers["reads"] = []
@@ -245,6 +244,17 @@ def _handle_0860(headers, pre_record, record):
     bd["metering-gbp"] += Decimal(parts["metering_gbp"]) / Decimal("100")
 
 
+def _handle_0960(headers, pre_record, record):
+    parts = _chop_record(
+        record,
+        days=3,
+        payment=12,
+        rate=6,
+    )
+    bd = headers["breakdown"]
+    bd["late_payment_gbp"] += Decimal(parts["payment"]) / Decimal(100)
+
+
 def _handle_1455(headers, pre_record, record):
     parts = _chop_record(
         record, ccl_kwh=13, unknown_1=10, ccl_rate=13, ccl_gbp=12, unkown_2=8
@@ -294,12 +304,6 @@ def _handle_1500(headers, pre_record, record):
     breakdown = headers["breakdown"]
     net = Decimal("0.00") + Decimal(parts["net"]) / Decimal("100")
     gross = Decimal("0.00") + Decimal(parts["gross"]) / Decimal("100")
-    if "late_payment" in headers:
-        late_payment_gbp = headers["late_payment"]
-        net += late_payment_gbp
-        gross += late_payment_gbp
-        breakdown["late-payment-gbp"] += late_payment_gbp
-        del headers["late_payment"]
 
     return {
         "bill_type_code": "W" if net < 0 else "N",
@@ -354,6 +358,7 @@ LINE_HANDLERS = {
     "0461": _handle_0461,
     "0470": _handle_0470,
     "0860": _handle_0860,
+    "0960": _handle_0960,
     "1455": _handle_1455,
     "1460": _handle_1460,
     "1500": _handle_1500,

chellow/reports/report_247.py

@@ -471,14 +471,13 @@ def _process_site(
     if supply_ids is not None:
         q = q.where(Supply.id.in_(supply_ids))
     for supply in sess.execute(q).scalars():
-        last_era = (
-            sess.execute(
-                select(Era).where(Era.supply == supply).order_by(Era.start_date.desc())
-            )
-            .scalars()
-            .first()
-        )
-        if last_era.finish_date is not None and last_era.start_date <= finish_date:
+        last_era = sess.scalars(
+            select(Era)
+            .join(SiteEra)
+            .where(Era.supply == supply)
+            .order_by(Era.start_date.desc())
+        ).first()
+        if last_era.finish_date is not None and last_era.finish_date < finish_date:
             site_era = sess.execute(
                 select(SiteEra).where(
                     SiteEra.era == last_era,

{chellow-1751875889.0.0.dist-info → chellow-1751991276.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1751875889.0.0
+Version: 1751991276.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-1751875889.0.0.dist-info → chellow-1751991276.0.0.dist-info}/RECORD

@@ -50,7 +50,7 @@ chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=opjXRrqrgBTbSKzL0JfTLP0
 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/drax_edi.py,sha256=cqd1YhW_IsxUMsW5xcyC_0CHpqkMRWKQgcXERZoIqGM,15083
+chellow/e/bill_parsers/drax_edi.py,sha256=TC_vlBLn_elmIZrug-vqVRjUcrd7U2fDO75PTzwmcEY,15091
 chellow/e/bill_parsers/drax_element_edi.py,sha256=kxjg1KA4UheMa8doGp9skXtQYrNK8Eisy9ksafR5TQo,13661
 chellow/e/bill_parsers/edf_export_xlsx.py,sha256=J4lY8epiSTIePZ6D1SGD76TXRoev35KrUC2sjHkNqlE,6632
 chellow/e/bill_parsers/engie_edi.py,sha256=PDMDI0aqUM1lalgzxih1YmMho11n1rMqE0vyL-aEIs8,15840
@@ -61,7 +61,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=i1TcEo3eY6_i_1DfRP3fIX7kIsx5cVx_FZPFG6S-FNo,11252
+chellow/e/bill_parsers/mm.py,sha256=1myKrms3yVAhKFCzk3swWJjCwepZYk8GkD0wK0bpsj4,11184
 chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=YvQ0Q6HlZ4XSk6Phx1UWaTSj8FREVjwQe8nrpiLVzbU,5458
 chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=osCpUYUdLcPtlo7ngXWGw0ImnxssLa1fOSejMwe51-k,6381
 chellow/e/bill_parsers/sse_edi.py,sha256=L85DOfNkqexeEIEr8pCBn_2sHJI-zEaw6cogpE3YyYM,15204
@@ -88,7 +88,7 @@ chellow/reports/report_219.py,sha256=3Zs16ka6dWWY_lCDoA-ZFrlPb4vHk1LQoa2yrlTMntA
 chellow/reports/report_231.py,sha256=WARLztV2HzBFSi5_xvY_DTXVyuBBbBYiU0RazfjKw-Y,5270
 chellow/reports/report_233.py,sha256=qJdPFuBgQAWD24BsljgGJ44L_RGdHOA1RqsxGjTWhFc,4975
 chellow/reports/report_241.py,sha256=lfivElRkV_CZAhck0rxAuhqzgponj3aWwmwGMNQvUxg,5343
-chellow/reports/report_247.py,sha256=SnbGqvCkakeYrPvFA13NRSiuwJWaO_CVO2hU4_pw4w0,46044
+chellow/reports/report_247.py,sha256=00a-shl3TRRWyana42OZHvPnjE803rQc_2HzlSA5xKE,46029
 chellow/reports/report_29.py,sha256=ZXnq6Kg5on-IPquUsH4bn46mBVESY_WhwqDWZPXOJwo,2695
 chellow/reports/report_291.py,sha256=BnWtxe0eWN2QKKWpwjs5-RI5LbReBKL119QbkrkNhV8,7478
 chellow/reports/report_33.py,sha256=lt1EN_LNx6u-AgdaS3YRkPMZA33JgMcELolHF4oJUMw,16689
@@ -385,6 +385,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-1751875889.0.0.dist-info/METADATA,sha256=kcMnLuPtGWof_7oGIYIBdGKxSEfv0td8GuA6NsLidvw,12585
-chellow-1751875889.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1751875889.0.0.dist-info/RECORD,,
+chellow-1751991276.0.0.dist-info/METADATA,sha256=3ZCeJU6ewzdHi69KcwtbjlustTVdKbO5HcmRUZQueHM,12585
+chellow-1751991276.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1751991276.0.0.dist-info/RECORD,,