chellow 1731435800.0.0__py3-none-any.whl → 1731581146.0.0__py3-none-any.whl

chellow/general_import.py

@@ -149,11 +149,13 @@ def general_import_era(sess, action, vals, args):
         comm_code = add_arg(args, "Comms Type", vals, 12)
         comm = era.comm if comm_code == NO_CHANGE else Comm.get_by_code(sess, comm_code)
 
-        ssc_code = add_arg(args, "SSC", vals, 13)
-        if ssc_code == NO_CHANGE:
-            ssc_code = era.ssc.code
-        elif len(ssc_code) == 0:
+        ssc_code_str = add_arg(args, "SSC", vals, 13)
+        if ssc_code_str == NO_CHANGE:
+            ssc_code = None if era.ssc is None else era.ssc.code
+        elif len(ssc_code_str) == 0:
             ssc_code = None
+        else:
+            ssc_code = ssc_code_str
 
         es_code = add_arg(args, "Energisation Status", vals, 14)
         if es_code == NO_CHANGE:

chellow/reports/report_111.py

@@ -178,6 +178,7 @@ def content(
                 "bill-kwh",
                 "bill-net-gbp",
                 "bill-vat-gbp",
+                "bill-gross-gbp",
                 "bill-start-date",
                 "bill-finish-date",
                 "imp-mpan-core",
@@ -371,7 +372,13 @@ def _process_supply(
 
         covered_start = bill_start
         covered_finish = bill_start
-        covered_bdown = {"sum-msp-kwh": 0, "net-gbp": 0, "vat-gbp": 0, "problem": ""}
+        covered_bdown = {
+            "sum-msp-kwh": 0,
+            "net-gbp": 0,
+            "vat-gbp": 0,
+            "gross-gbp": 0,
+            "problem": "",
+        }
 
         vb_elems = set()
         enlarged = True
@@ -439,9 +446,23 @@ def _process_supply(
         primary_covered_bill = None
         for covered_bill in covered_bills.values():
             bill_ids.discard(covered_bill.id)
-            covered_bdown["net-gbp"] += float(covered_bill.net)
-            covered_bdown["vat-gbp"] += float(covered_bill.vat)
             covered_bdown["sum-msp-kwh"] += float(covered_bill.kwh)
+            for elem, val in (
+                ("net", covered_bill.net),
+                ("vat", covered_bill.vat),
+                ("gross", covered_bill.gross),
+            ):
+                covered_bdown[f"{elem}-gbp"] += float(val)
+                covered_elems.add(elem)
+                add_gap(
+                    caches,
+                    gaps,
+                    elem,
+                    covered_bill.start_date,
+                    covered_bill.finish_date,
+                    False,
+                    val,
+                )
             for k, v in loads(covered_bill.breakdown).items():
                 if k in ("raw_lines", "raw-lines", "vat"):
                     continue
@@ -599,7 +620,7 @@ def _process_supply(
 
             for dt, bl in vb_hhs.items():
                 for k, v in bl.items():
-                    if all((k.endswith("-gbp"), k != "net-gbp", v != 0)):
+                    if k.endswith("-gbp") and v != 0:
                         add_gap(caches, gaps, k[:-4], dt, dt, True, v)
 
             for k in virtual_bill.keys():
@@ -625,13 +646,13 @@ def _process_supply(
                 f"virtual bill. "
             )
 
-        try:
-            del virtual_bill["net-gbp"]
-        except KeyError:
-            pass
-
+        virtual_bill.pop("net-gbp", None)
+        virtual_bill.pop("gross-gbp", None)
         virtual_bill["net-gbp"] = sum(
-            v for k, v in virtual_bill.items() if k.endswith("-gbp")
+            v for k, v in virtual_bill.items() if k.endswith("-gbp") and k != "vat-gbp"
+        )
+        virtual_bill["gross-gbp"] = virtual_bill["net-gbp"] + virtual_bill.get(
+            "vat-gbp", 0
         )
 
         era = supply.find_era_at(sess, bill_finish)
@@ -665,6 +686,7 @@ def _process_supply(
             "bill-kwh": bill.kwh,
             "bill-net-gbp": bill.net,
             "bill-vat-gbp": bill.vat,
+            "bill-gross-gbp": bill.gross,
             "bill-start-date": bill_start,
             "bill-finish-date": bill_finish,
             "imp-mpan-core": imp_mpan_core,

{chellow-1731435800.0.0.dist-info → chellow-1731581146.0.0.dist-info}/METADATA

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

@@ -4,7 +4,7 @@ chellow/bank_holidays.py,sha256=T_utYMwe_g1dz5X-aOTdIPryg49SvB7QsWM1yphlqG8,4423
 chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=dixp-O0MF2_mlwrnKx3D9DH09Qu05BjTo0rZfigTjR4,5534
 chellow/edi_lib.py,sha256=alu20x9ZX06iPfnNI9dEJzuP6RIf4We3Y_M_bl7RrcY,51789
-chellow/general_import.py,sha256=Ia2Y40NEwqOYBHUwafJRcI34EO0WMX6FSBQJtGHeY0M,65874
+chellow/general_import.py,sha256=5kJszUnk3CVJclsW-mCjLF0z8lw7CaNNhIzUoaq20kY,65965
 chellow/models.py,sha256=9LLROzS6gXZGICk0ITXhCyTtKaIY7HW4bMqWg4Mc-xw,244221
 chellow/national_grid.py,sha256=czwIZqzJndSGhEMQ5YzI6hRBhvjkM6VRVYXybf4_KXg,4377
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
@@ -75,7 +75,7 @@ chellow/gas/transportation.py,sha256=Bkg8TWOs-v0ES-4qqwbleiOhqbE_t2KauUx9JYMZELM
 chellow/gas/views.py,sha256=R4Ky8syioWSQJLTuSKVLsc266eDv8a6WEo_e60u_4ug,59021
 chellow/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/reports/report_109.py,sha256=FmRWG8wQC97cj0nqQH7mrfbYesRIKWXQLh6ERHvtHrU,11212
-chellow/reports/report_111.py,sha256=rgwoOPfvbfwIC_IjBqs2e8umF_YTtpyejLrX_uCgyHE,28145
+chellow/reports/report_111.py,sha256=MBXMABwHonjH2cvkqFYC0Vx7rU7LB2mJxXsEjI0RvTU,28828
 chellow/reports/report_169.py,sha256=tnTiHmhigcgZ7E8rUSfgzsVYUCW947xBZZq04-KqfK8,9287
 chellow/reports/report_181.py,sha256=mCL6vXfrj8r0kL-LilDS0SnSu5tJOzCq7eMJVx9zpEw,4999
 chellow/reports/report_183.py,sha256=DZX-hHJPl_Tbgkt31C_cuLZg_5L2b6iCPQ5foOZizR0,8817
@@ -377,6 +377,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-1731435800.0.0.dist-info/METADATA,sha256=ilPn6kcxryT74lMCin7HXAJqf48jbjfuyV1Y3qmf9dA,12204
-chellow-1731435800.0.0.dist-info/WHEEL,sha256=WJ9WQ4-pUYxfD_tEj5GvKSG9KSULNumqkTQdolV8mME,87
-chellow-1731435800.0.0.dist-info/RECORD,,
+chellow-1731581146.0.0.dist-info/METADATA,sha256=nVYIrIIfi0Wd791y4tLcCZoJMu9CQO31xsJCB77Pqfc,12204
+chellow-1731581146.0.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+chellow-1731581146.0.0.dist-info/RECORD,,

{chellow-1731435800.0.0.dist-info → chellow-1731581146.0.0.dist-info}/WHEEL

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