chellow 1726494151.0.0__py3-none-any.whl → 1726564344.0.0__py3-none-any.whl

chellow/gas/bill_parser_total_edi.py

@@ -110,10 +110,10 @@ def _process_CCD2(elements, headers):
     units_billed = to_decimal(nuct) / units_divisor
     breakdown[key] += units_billed
 
-    if "start_date" not in headers:
+    if tpref == "standing" or "start_date" not in headers:
         headers["start_date"] = to_date(csdt[0])
 
-    if "finish_date" not in headers:
+    if tpref == "standing" or "finish_date" not in headers:
         headers["finish_date"] = _to_finish_date(cedt[0])
 
     if "mprn" not in headers:

chellow/reports/report_111.py

@@ -2,7 +2,7 @@ import csv
 import sys
 import threading
 import traceback
-from collections import OrderedDict, defaultdict
+from collections import defaultdict
 from datetime import datetime as Datetime
 from decimal import Decimal
 from itertools import combinations
@@ -11,7 +11,7 @@ from dateutil.relativedelta import relativedelta
 
 from flask import g, request
 
-from sqlalchemy import or_
+from sqlalchemy import or_, select
 from sqlalchemy.orm import joinedload, subqueryload
 from sqlalchemy.sql.expression import null, true
 
@@ -27,7 +27,6 @@ from chellow.models import (
     Contract,
     Era,
     Llfc,
-    MarketRole,
     MtcParticipant,
     RSession,
     RegisterRead,
@@ -380,19 +379,19 @@ def _process_supply(
         while enlarged:
             enlarged = False
             covered_elems = find_elements(bill)
-            covered_bills = OrderedDict(
+            covered_bills = dict(
                 (b.id, b)
-                for b in sess.query(Bill)
-                .join(Batch)
-                .join(Contract)
-                .join(MarketRole)
-                .filter(
-                    Bill.supply == supply,
-                    Bill.start_date <= covered_finish,
-                    Bill.finish_date >= covered_start,
-                    MarketRole.code == market_role_code,
+                for b in sess.scalars(
+                    select(Bill)
+                    .join(Batch)
+                    .where(
+                        Bill.supply == supply,
+                        Bill.start_date <= covered_finish,
+                        Bill.finish_date >= covered_start,
+                        Batch.contract == contract,
+                    )
+                    .order_by(Bill.start_date, Bill.issue_date)
                 )
-                .order_by(Bill.start_date, Bill.issue_date)
             )
             while True:
                 to_del = None

chellow/templates/e/dc_contracts.html

@@ -13,6 +13,7 @@
 		<caption>Current DC Contracts</caption>
 		<thead>
 			<tr>
+				<th>View</th>
 				<th>Name</th>
 				<th>Start Date</th>
 				<th>DC</th>
@@ -21,14 +22,10 @@
 		<tbody>
 			{% for contract in current_dc_contracts %}
 				<tr>
-					<td>
-						<a href="/e/dc_contracts/{{contract.id}}">{{contract.name}}</a>
-					</td>
+					<td><a href="/e/dc_contracts/{{contract.id}}">View</a></td>
+					<td>{{contract.name}}</td>
 					<td>{{ contract.start_rate_script.start_date|hh_format }}</td>
-					<td>
-						<a href="/e/parties/{{contract.party.id}}"
-							>{{contract.party.name}}</a>
-					</td>
+					<td><a href="/e/parties/{{contract.party.id}}">{{contract.party.name}}</a></td>
 				</tr>
 			{% endfor %}
 		</tbody>

chellow/templates/e/supplier_batch.html

@@ -153,7 +153,7 @@
 	<form action="/reports/111">
 		<fieldset>
 			<input type="hidden" name="batch_id" value="{{batch.id}}">
-			<legend>Download McBill Check</legend>
+			<legend>Download Bill Check</legend>
 			<label>MPAN Cores</label>
 			{{input_textarea(
 				'mpan_cores', '', 5, 40,

{chellow-1726494151.0.0.dist-info → chellow-1726564344.0.0.dist-info}/METADATA

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

@@ -60,7 +60,7 @@ chellow/e/bill_parsers/sww_xls.py,sha256=QEjiuvwvr5FuWCfqqVw8LaA_vZyAKsvRAS5fw3x
 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_engie_edi.py,sha256=Ko0vZP-QdVQ1uuhS_5cdrii60_cM4b_LFJMoY0pZqnk,8950
-chellow/gas/bill_parser_total_edi.py,sha256=hbjvahC8mQ0RuyIEQVJu18XNqq7T_htnV-OYg6NSuiE,7379
+chellow/gas/bill_parser_total_edi.py,sha256=HdX2ctKvqIA5saf8VkpWmYWfqaZsdB-sAEcMSZjTgE4,7425
 chellow/gas/ccl.py,sha256=DMlcPUELZi00CaDekVJINYk3GgH5apFrImVdmkbyba0,2913
 chellow/gas/cv.py,sha256=4cdYYQ8Qak6NeYdBCB4YaQ0jX8-UkaydIIdibCQuXxM,7344
 chellow/gas/dn_rate_parser.py,sha256=Mq8rAcUEUxIQOks59bsCKl8GrefvoHbrTCHqon9N0z0,11340
@@ -69,7 +69,7 @@ chellow/gas/transportation.py,sha256=Bkg8TWOs-v0ES-4qqwbleiOhqbE_t2KauUx9JYMZELM
 chellow/gas/views.py,sha256=zOlJnL6eVq7Tag-0NMabzCPQk5AoTrclEz-923pbwAE,57851
 chellow/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/reports/report_109.py,sha256=FmRWG8wQC97cj0nqQH7mrfbYesRIKWXQLh6ERHvtHrU,11212
-chellow/reports/report_111.py,sha256=AlYjvCDpGNe1qBuzW52EONWDsFaIVElug0Vpe9qm1PY,28169
+chellow/reports/report_111.py,sha256=rgwoOPfvbfwIC_IjBqs2e8umF_YTtpyejLrX_uCgyHE,28145
 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
@@ -191,7 +191,7 @@ chellow/templates/e/dc_contract_hh_import.html,sha256=UODiBFNohb60MjH1w-9JW1JE0O
 chellow/templates/e/dc_contract_hh_imports.html,sha256=eXFDGyzSgag4JRism81_p5yTzQOjCIXaVkQ8tl3dDcM,8172
 chellow/templates/e/dc_contract_properties.html,sha256=2EmA91gYWZcTOHQ3PxXQrpTOb8dm0OGjwRWsW6qNI9s,455
 chellow/templates/e/dc_contract_properties_edit.html,sha256=TGYcHTlWbk5WmjZPkdbHhRVZcOpEfhowCp2penZcGiE,1704
-chellow/templates/e/dc_contracts.html,sha256=v8czpEcMzndngfWNXIKXib6Xrz9OwJjQAmNQNrQ6Y08,1705
+chellow/templates/e/dc_contracts.html,sha256=vatnEwXJ9xvk97_NI537rTKqIExAuDGhquQ8k07s5xA,1708
 chellow/templates/e/dc_contracts_add.html,sha256=2lrGrNqAoKp16OiMoNDNlJxBMW3QdSPfgEFheSg826s,710
 chellow/templates/e/dc_rate_script.html,sha256=gfKUHV2IMsTQT-cYfjl4aiEBqGEWSj3uW22UZpoyGq4,1219
 chellow/templates/e/dc_rate_script_add.html,sha256=5MlE4r5eLww3xI9qZRlu8hE8bU7RVwyDJcr20-0e4uY,644
@@ -289,7 +289,7 @@ chellow/templates/e/source.html,sha256=6cLjZWKS2w9Zy1C4hzi1lTKXAdKKFQ8wSxbwAjhP3
 chellow/templates/e/sources.html,sha256=AW_ysj5ZzArTLz0-FWappMsUEU1AO9gw7D4XSHbINu4,453
 chellow/templates/e/ssc.html,sha256=NiTbn9yLYYG_DV4j9S73rnIVmzTAzTbyaXomverHNnI,811
 chellow/templates/e/sscs.html,sha256=r4uVLWSCMVhYeN_r5e9QVJGLPc4R9yhdJxGXON9Xma8,983
-chellow/templates/e/supplier_batch.html,sha256=xr17ydDxKALMOcs8rfz-9T4wGyHKJqPpOQqz9brT9eY,5013
+chellow/templates/e/supplier_batch.html,sha256=A-iut_y8jCJ2nm0QQF_uPuRJWnWH9eN056cUJlmBJ6Q,5011
 chellow/templates/e/supplier_batch_add.html,sha256=RabJ20yLpsF_npSLL5aeLlPDa2tL99fENaIzDYZJy1w,1240
 chellow/templates/e/supplier_batch_edit.html,sha256=wFnhGHLo51omagJdE8viIYgmift7Y3n0C39sMru7XWU,1190
 chellow/templates/e/supplier_batch_file.html,sha256=fohdthY3ibO9a_2BJsYWyJhZL369F0gaUV7McFzWhMQ,1226
@@ -365,6 +365,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-1726494151.0.0.dist-info/METADATA,sha256=64Fg0dcAvXBOlRHQla8VKh58635-X7YjLyWsRhWhv2A,12204
-chellow-1726494151.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1726494151.0.0.dist-info/RECORD,,
+chellow-1726564344.0.0.dist-info/METADATA,sha256=OH6pGKFudqcxiUUQ7qIvzgp-iO_kS7m6T0CjY-ywzh8,12204
+chellow-1726564344.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1726564344.0.0.dist-info/RECORD,,