chellow 1753175604.0.0__py3-none-any.whl → 1753182209.0.0__py3-none-any.whl

chellow/e/views.py

@@ -5714,31 +5714,28 @@ def supply_post(supply_id):
             start_date_str = req_str("start_date")
             start_date = parse_hh_start(start_date_str)
             if start_date is None:
-                raise BadRequest("The data of the MSN change is blank in ECOES.")
+                raise BadRequest("The date of the MSN change is blank.")
 
             msn = req_str("msn")
             msg = ""
             era = supply.find_era_at(g.sess, start_date)
-            if era is None:
-                raise BadRequest(f"There are no eras from {start_date|hh_format}")
-            else:
-                if era.start_date != start_date:
-                    era = supply.insert_era_at(g.sess, start_date)
-                    g.sess.commit()
-                for era in supply.find_eras(g.sess, start_date, None):
-                    if era.msn == msn:
-                        msg += (
-                            f"The era at {hh_format(era.start_date)} already has the "
-                            f"MSN {msn}. "
-                        )
-                    else:
-                        era.msn = msn
+            if era is not None and era.start_date != start_date:
+                era = supply.insert_era_at(g.sess, start_date)
+                g.sess.commit()
+            for era in supply.find_eras(g.sess, start_date, None):
+                if era.msn == msn:
+                    msg += (
+                        f"The era at {hh_format(era.start_date)} already has the "
+                        f"MSN {msn}. "
+                    )
+                else:
+                    era.msn = msn
 
-                        g.sess.commit()
-                        msg += (
-                            f"The era at {hh_format(era.start_date)} has been "
-                            f"successfully updated with the MSN {msn}. "
-                        )
+                    g.sess.commit()
+                    msg += (
+                        f"The era at {hh_format(era.start_date)} has been "
+                        f"successfully updated with the MSN {msn}. "
+                    )
             flash(msg)
         return render_template("supply_post.html")
 

chellow/gas/bill_parser_bgs_xlsx.py

@@ -5,12 +5,13 @@ from decimal import Decimal, InvalidOperation
 from enum import Enum, auto
 from io import BytesIO
 
+from dateutil.relativedelta import relativedelta
 
 from openpyxl import load_workbook
 
 from werkzeug.exceptions import BadRequest
 
-from chellow.utils import c_months_u, to_ct, to_utc
+from chellow.utils import to_ct, to_utc
 
 
 class Title(Enum):
@@ -151,13 +152,13 @@ def _parse_row(bills, sheet, row, title_row):
     column_map = make_column_map(title_row)
     mprn_raw = get_value(sheet, row, column_map[Title.MPRN])
     mprn = str(mprn_raw)
-    reference = get_value(sheet, row, column_map[Title.BILL])
+    reference = str(get_value(sheet, row, column_map[Title.BILL]))
     account = get_value(sheet, row, column_map[Title.ACCOUNT])
     issue_date = get_date(sheet, row, column_map[Title.BILL_DATE])
-    period_naive = get_date_naive(sheet, row, column_map[Title.BILLING_PERIOD])
-    start_date, finish_date = list(
-        c_months_u(start_year=period_naive.year, start_month=period_naive.month)
-    )[0]
+    charge_period_from = get_date(sheet, row, column_map[Title.CHARGE_PERIOD_FROM])
+    charge_period_end_naive = get_date_naive(
+        sheet, row, column_map[Title.CHARGE_PERIOD_END]
+    )
 
     try:
         mprn_values = bills[mprn]
@@ -165,16 +166,18 @@ def _parse_row(bills, sheet, row, title_row):
         mprn_values = bills[mprn] = {}
 
     try:
-        bill = mprn_values[period_naive]
+        bill = mprn_values[reference]
     except KeyError:
-        bill = mprn_values[period_naive] = {
-            "bill_type_code": "N",
+        bill = mprn_values[reference] = {
+            "bill_type_code": "W" if reference.startswith("CR") else "N",
             "mprn": mprn,
             "reference": reference,
             "account": account,
             "issue_date": issue_date,
-            "start_date": start_date,
-            "finish_date": finish_date,
+            "start_date": charge_period_from,
+            "finish_date": to_utc(
+                to_ct(charge_period_end_naive) + relativedelta(hours=23, minutes=30)
+            ),
             "kwh": Decimal("0"),
             "breakdown": defaultdict(int, {}),
             "net_gbp": Decimal("0.00"),
@@ -190,6 +193,8 @@ def _parse_row(bills, sheet, row, title_row):
     qunit = get_value(sheet, row, column_map[Title.QUNIT])
     charge = get_dec(sheet, row, column_map[Title.CHARGE]) / Decimal("100")
     total = get_dec(sheet, row, column_map[Title.TOTAL])
+    if bill["bill_type_code"] == "W":
+        quantity = quantity * -1
     if element_desc == "VAT":
         bill["net_gbp"] += quantity
         bill["vat_gbp"] += total

{chellow-1753175604.0.0.dist-info → chellow-1753182209.0.0.dist-info}/METADATA

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

@@ -44,7 +44,7 @@ chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,623
 chellow/e/tlms.py,sha256=K2n-dF6qNW7VQp4m_sVK1HWnXarmAIzpotWXYqWQacY,9363
 chellow/e/tnuos.py,sha256=NBmc-f3oezrl4gviAKobljHfICTpBKxxxEGBGJi_lRk,4927
 chellow/e/triad.py,sha256=uQIngSrz8irBXQ0Rp_s8nAUzu-y2Ms7aj4B38_Ff8y8,13720
-chellow/e/views.py,sha256=pWLbcG04t8mZB6y9Dp8bkcJpnWrfF1x10eCGagMbDl8,220804
+chellow/e/views.py,sha256=7nvH0D3Q1Q1bmTtPTzHKmMt8uNnhhF9GYHWRxZIBWT0,220622
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=opjXRrqrgBTbSKzL0JfTLP0fnz3DL3oRZZ4P0DifQ3I,4119
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3vd2HLeQU_4P0iBUd3WA,4219
@@ -67,7 +67,7 @@ chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=osCpUYUdLcPtlo7ngXWGw0
 chellow/e/bill_parsers/sse_edi.py,sha256=L85DOfNkqexeEIEr8pCBn_2sHJI-zEaw6cogpE3YyYM,15204
 chellow/e/bill_parsers/sww_xls.py,sha256=QEjiuvwvr5FuWCfqqVw8LaA_vZyAKsvRAS5fw3xtFhM,7533
 chellow/gas/bill_import.py,sha256=w0lPgK_Drzh8rtnEBQe3qFuxrgzZ6qQSgpaGrrGznMU,6549
-chellow/gas/bill_parser_bgs_xlsx.py,sha256=ySYAa6fq990DW01bQMk8Ix_sziWfm_5d2Il7IrYz9Ys,7522
+chellow/gas/bill_parser_bgs_xlsx.py,sha256=ZuLts8Y31gxtCQoXJq2CQRRMMpYbAWqsbfMB1S6fPqU,7757
 chellow/gas/bill_parser_csv.py,sha256=Ecdy-apFT-mWAxddAsM4k1s-9-FpIaOfjP0oFc0rdQg,5557
 chellow/gas/bill_parser_engie_edi.py,sha256=Ko0vZP-QdVQ1uuhS_5cdrii60_cM4b_LFJMoY0pZqnk,8950
 chellow/gas/bill_parser_total_edi.py,sha256=8HZH5Le24bVNFDc7vaKbauMaYR-n9P6u0ZG7gDdqbIA,11325
@@ -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-1753175604.0.0.dist-info/METADATA,sha256=jyoTCzAK7PWcHx5zECDlMdAjYry29dMAQXmL90z-3aE,12585
-chellow-1753175604.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1753175604.0.0.dist-info/RECORD,,
+chellow-1753182209.0.0.dist-info/METADATA,sha256=7anKRCEEZQ42bSqtEd4uozS1hdVluvK83SWQvDymD1M,12585
+chellow-1753182209.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1753182209.0.0.dist-info/RECORD,,