chellow 1742546814.0.0__py3-none-any.whl → 1742914638.0.0__py3-none-any.whl

chellow/general_import.py

@@ -1052,6 +1052,12 @@ def general_import_bill(sess, action, vals, args):
             breakdown,
         )
 
+    elif action == "delete":
+        bill_id_str = add_arg(args, "Bill Chellow Id", vals, 0)
+        bill_id = int(bill_id_str)
+        bill = Bill.get_by_id(sess, bill_id)
+        bill.delete(sess)
+
 
 def general_import_g_bill(sess, action, vals, args):
     if action == "insert":

chellow/reports/report_bills.py

@@ -16,6 +16,7 @@ from chellow.utils import csv_make_val, req_int
 def _content(sess, writer, batch_id):
     batch = Batch.get_by_id(sess, batch_id)
     titles = [
+        "chellow_id",
         "supplier_contract",
         "batch_reference",
         "bill_reference",
@@ -60,6 +61,7 @@ def _content(sess, writer, batch_id):
                 vbd["net"] += vat_vals["net"]
 
         vals = {
+            "chellow_id": bill.id,
             "supplier_contract": batch.contract.name,
             "batch_reference": batch.reference,
             "bill_reference": bill.reference,

chellow/reports/report_g_supplies_snapshot.py

@@ -9,11 +9,7 @@ from sqlalchemy import or_
 from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.expression import null
 
-from werkzeug.exceptions import BadRequest
-
 from chellow.dloads import open_file
-from chellow.e.computer import contract_func
-from chellow.gas.engine import GDataSource, forecast_date
 from chellow.models import GEra, GSupply, Session
 from chellow.utils import csv_make_val, req_date, req_int
 
@@ -44,8 +40,6 @@ def content(date, g_supply_id, user):
                     "soq",
                 )
             )
-            fdate = forecast_date()
-            caches = {}
 
             g_eras = (
                 sess.query(GEra, GSupply)
@@ -83,16 +77,7 @@ def content(date, g_supply_id, user):
                 g_supply_start_date = sup_g_eras[0].start_date
                 g_supply_finish_date = sup_g_eras[-1].finish_date
 
-                ds = GDataSource(sess, date, date, fdate, g_era, caches, None)
                 g_supplier_contract = g_era.g_contract
-                vb_function = contract_func(caches, g_supplier_contract, "virtual_bill")
-                if vb_function is None:
-                    raise BadRequest(
-                        f"The contract {g_supplier_contract.name} doesn't have the "
-                        f"virtual_bill() function."
-                    )
-                vb_function(ds)
-                bill = ds.bill
 
                 writer.writerow(
                     csv_make_val(value)
@@ -112,8 +97,8 @@ def content(date, g_supply_id, user):
                         g_supply_start_date,
                         g_supply_finish_date,
                         g_era.g_reading_frequency.code,
-                        bill["aq"],
-                        bill["soq"],
+                        g_era.aq,
+                        g_era.soq,
                     ]
                 )
     except BaseException:

chellow/templates/general_imports.html

@@ -334,6 +334,11 @@
 				<td>Paid?</td>
 				<td>Breakdown</td>
 			</tr>
+			<tr>
+				<td><em>delete</em></td>
+				<td><em>bill</em></td>
+				<td>Bill Chellow Id</td>
+			</tr>
 			<tr>
 				<td><em>update</em></td>
 				<td><em>register_read</em></td>

{chellow-1742546814.0.0.dist-info → chellow-1742914638.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1742546814.0.0
+Version: 1742914638.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-1742546814.0.0.dist-info → chellow-1742914638.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=tcYZK2N7HOFJSkYyy3MMxVBEvMFjfB9pjF0ksujtkFA,65113
+chellow/general_import.py,sha256=pRGMcdhPq0Gfr1QG8LiqToKp-mnYa2yB8tfh8fy7eQo,65313
 chellow/models.py,sha256=GVuPnDUGJqPbdD8Z4Ccoiw4ZLeuEXFgAkrTLS_znTQw,244452
 chellow/national_grid.py,sha256=czwIZqzJndSGhEMQ5YzI6hRBhvjkM6VRVYXybf4_KXg,4377
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
@@ -96,13 +96,13 @@ chellow/reports/report_81.py,sha256=bBpV6MtvKGtoLiqzZoK2h21KDs4vfDwy-etpfL9oiEI,
 chellow/reports/report_87.py,sha256=udzbCuXcckWD-OHmfJCT6bwg_paYhm4vfDWlL8WM-jA,6933
 chellow/reports/report_asset_comparison.py,sha256=Cl2NgvbclqhOVvKuUu3sajTVO2JupMfzK3bV0_K8eNs,6077
 chellow/reports/report_batches.py,sha256=MoCv2dE-JgaJzaMjMA-kZrPkYR13uDoXer5UuF12OYc,4757
-chellow/reports/report_bills.py,sha256=cxhrheJggBcP0BHmbNKCPG25KxgBSFr5NOZ_XCIek1M,3344
+chellow/reports/report_bills.py,sha256=LP7XDxzO0Fp10c8xDE67e4tHTEc7nN74ESQBy762Nx4,3401
 chellow/reports/report_csv_llfcs.py,sha256=mMB06b6Jems5kcQU4H4Le_fyKgVr8THP8BCx3pkvg5E,1903
 chellow/reports/report_csv_site_hh_data.py,sha256=ik0OkGVo1bfTXLdcT3gPUHnxSkSdorzZheP3qgnOR5c,4331
 chellow/reports/report_csv_site_snags.py,sha256=AuAy6vjL0g7vwPPAZhBqxOyITL9_jnyFj012MnUcxxk,2627
 chellow/reports/report_ecoes_comparison.py,sha256=wEwJrFMOz74CidONkTmgWD1Ghhgo9DT0V7Vddkspkqg,21403
 chellow/reports/report_g_monthly_duration.py,sha256=VQq5xTLvdu9Z_vqrgWNP2S4xm2uCSSZA9HVNiQv9Dus,18264
-chellow/reports/report_g_supplies_snapshot.py,sha256=f6yuds1_X3j3domC1lCyA788RdxCgFZSee-4L7BhwU8,4677
+chellow/reports/report_g_supplies_snapshot.py,sha256=9xB6RDrnbgxuomMcP1b1yEP4kOnEJ34WgKpyxLTprOQ,3998
 chellow/reports/report_g_supply_virtual_bill.py,sha256=EaYrB8PHJIXrUuhiZ7dwUlbNBkuyJebQHrdc308_z1o,3653
 chellow/reports/report_g_virtual_bills.py,sha256=20vHa5LGQwOAlJlaGJaGszZrrbT0PMOZJf6hSxU2hIQ,4528
 chellow/reports/report_g_virtual_bills_hh.py,sha256=gaiLEmKTpq6JsfZ1p0SdCDuPvzvigXp6z88gHRCA63w,3416
@@ -122,7 +122,7 @@ chellow/templates/csv_sites_monthly_duration.html,sha256=59gErG6KwA57z-qh2EJsVGv
 chellow/templates/downloads.html,sha256=R9QPcFz-PLJOX7rDlmquIk-Hp9Iq-thzWCTfOexSpXg,937
 chellow/templates/edi_viewer.html,sha256=szUthgHOdph6Of-7f_1LeC_zYlNJaMeS5ctn6xTAeiM,1437
 chellow/templates/general_import.html,sha256=9ezzieDjaPBZ0nUJkMkzoDxWVzYtr4D-Dr2UCA5xV8U,1370
-chellow/templates/general_imports.html,sha256=VRmBqYsXsirm880WiFrJ3CknAXAoLR9Mnpz9cKjIeM8,13069
+chellow/templates/general_imports.html,sha256=9sYN7FdzfxFypAUbUJ4VbhU3WhJrjArtqneohgX1hGE,13171
 chellow/templates/home.html,sha256=illtSabepcScYwmKss0o2gwvjXGBtr6LkfwmeL6ezSA,5655
 chellow/templates/input_date.html,sha256=rpgB5n0LfN8Y5djN_ZiuSxqdskxzCoKrEqI7hyJkVQo,1248
 chellow/templates/local_report.html,sha256=pV7_0QwyQ-D3OS9LXrly5pq3qprZnwTCoq6vCnMTkS4,1332
@@ -378,6 +378,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-1742546814.0.0.dist-info/METADATA,sha256=ydiM1RE9Ek1Bq_RcPSy12gn5mYm3jGkkfNYMtTZVMfI,12238
-chellow-1742546814.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1742546814.0.0.dist-info/RECORD,,
+chellow-1742914638.0.0.dist-info/METADATA,sha256=Qphw1t1o5DK0P4xefom0CRq28M2N0rPjj5D2Vs3iO50,12238
+chellow-1742914638.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1742914638.0.0.dist-info/RECORD,,