chellow 1759155233.0.0__py3-none-any.whl → 1759823276.0.0__py3-none-any.whl

chellow/general_import.py

@@ -942,47 +942,70 @@ def general_import_bill(sess, action, vals, args):
             supply,
         )
 
-        for i in range(15, len(vals), 11):
-            msn = add_arg(args, "Meter Serial Number", vals, i)
-            mpan_str = add_arg(args, "MPAN", vals, i + 1)
-            coefficient_str = add_arg(args, "Coefficient", vals, i + 2)
-            coefficient = Decimal(coefficient_str)
-            units = add_arg(args, "Units", vals, i + 3)
-            tpr_code = add_arg(args, "TPR", vals, i + 4)
-            if len(tpr_code) > 0:
-                tpr = Tpr.get_by_code(sess, tpr_code)
-            else:
-                tpr = None
-
-            prev_date_str = add_arg(args, "Previous Date", vals, i + 5)
-            prev_date = parse_hh_start(prev_date_str)
-            prev_value_str = add_arg(args, "Previous Value", vals, i + 6)
-            prev_value = Decimal(prev_value_str)
-
-            prev_type_str = add_arg(args, "Previous Type", vals, i + 7)
-            prev_type = ReadType.get_by_code(sess, prev_type_str)
-
-            pres_date_str = add_arg(args, "Present Date", vals, i + 8)
-            pres_date = parse_hh_start(pres_date_str)
-            pres_value_str = add_arg(args, "Present Value", vals, i + 9)
-            pres_value = Decimal(pres_value_str)
-
-            pres_type_str = add_arg(args, "Present Type", vals, i + 10)
-            pres_type = ReadType.get_by_code(sess, pres_type_str)
-            bill.insert_read(
-                sess,
-                tpr,
-                coefficient,
-                units,
-                msn,
-                mpan_str,
-                prev_date,
-                prev_value,
-                prev_type,
-                pres_date,
-                pres_value,
-                pres_type,
-            )
+        i = 15
+        while i < len(vals):
+            typ = add_arg(args, "read or element", vals, i)
+            if typ == "read":
+                msn = add_arg(args, "Meter Serial Number", vals, i + 1)
+                mpan_str = add_arg(args, "MPAN", vals, i + 2)
+                coefficient_str = add_arg(args, "Coefficient", vals, i + 3)
+                coefficient = Decimal(coefficient_str)
+                units = add_arg(args, "Units", vals, i + 4)
+                tpr_code = add_arg(args, "TPR", vals, i + 5)
+                if len(tpr_code) > 0:
+                    tpr = Tpr.get_by_code(sess, tpr_code)
+                else:
+                    tpr = None
+
+                prev_date_str = add_arg(args, "Previous Date", vals, i + 6)
+                prev_date = parse_hh_start(prev_date_str)
+                prev_value_str = add_arg(args, "Previous Value", vals, i + 7)
+                prev_value = Decimal(prev_value_str)
+
+                prev_type_str = add_arg(args, "Previous Type", vals, i + 8)
+                prev_type = ReadType.get_by_code(sess, prev_type_str)
+
+                pres_date_str = add_arg(args, "Present Date", vals, i + 9)
+                pres_date = parse_hh_start(pres_date_str)
+                pres_value_str = add_arg(args, "Present Value", vals, i + 10)
+                pres_value = Decimal(pres_value_str)
+
+                pres_type_str = add_arg(args, "Present Type", vals, i + 11)
+                pres_type = ReadType.get_by_code(sess, pres_type_str)
+                bill.insert_read(
+                    sess,
+                    tpr,
+                    coefficient,
+                    units,
+                    msn,
+                    mpan_str,
+                    prev_date,
+                    prev_value,
+                    prev_type,
+                    pres_date,
+                    pres_value,
+                    pres_type,
+                )
+                i += 12
+            elif typ == "element":
+                name = add_arg(args, "Name", vals, i + 1)
+                start_date_str = add_arg(args, "Start Date", vals, i + 2)
+                start_date = parse_hh_start(start_date_str)
+                finish_date_str = add_arg(args, "Finish Date", vals, i + 3)
+                finish_date = parse_hh_start(finish_date_str)
+                net_str = add_arg(args, "Net", vals, i + 4)
+                net = Decimal(net_str)
+                breakdown_str = add_arg(args, "Breakdown", vals, i + 5)
+                breakdown = _parse_breakdown(breakdown_str)
+                bill.insert_element(
+                    sess,
+                    name,
+                    start_date,
+                    finish_date,
+                    net,
+                    breakdown,
+                )
+                i += 6
 
     elif action == "update":
         bill_id_str = add_arg(args, "Bill Id", vals, 0)

chellow/reports/report_111.py

@@ -4,7 +4,7 @@ import threading
 import traceback
 from collections import defaultdict
 from datetime import datetime as Datetime
-from decimal import Decimal
+from decimal import Decimal, ROUND_HALF_UP
 from itertools import combinations
 from numbers import Number
 
@@ -18,6 +18,8 @@ from sqlalchemy.sql.expression import null
 
 from werkzeug.exceptions import BadRequest
 
+from zish import ZishException
+
 
 from chellow.dloads import open_file
 from chellow.e.computer import SupplySource, contract_func
@@ -456,6 +458,40 @@ def _process_period(
                     f"the Net GBP ({bill.net}) + VAT GBP ({bill.vat}) of the bill."
                 )
 
+            vat_net = Decimal("0.00")
+            vat_vat = Decimal("0.00")
+
+            try:
+                bd = bill.bd
+
+                if "vat" in bd:
+                    for vat_percentage, vat_vals in bd["vat"].items():
+                        calc_vat = Decimal(
+                            float(vat_percentage) / 100 * float(vat_vals["net"])
+                        ).quantize(Decimal("0.01"), rounding=ROUND_HALF_UP)
+                        if calc_vat != vat_vals["vat"]:
+                            actual_bill["problem"] += (
+                                f"The VAT at {vat_percentage}% on the net amount "
+                                f"{vat_vals['net']} is calculated to be {calc_vat}, "
+                                f"which is different from the value in the bill of "
+                                f"{vat_vals['vat']}"
+                            )
+                        vat_net += vat_vals["net"]
+                        vat_vat += vat_vals["vat"]
+            except ZishException as e:
+                actual_bill["problem"] += f"Problem parsing the breakdown: {e}"
+
+            if vat_net != bill.net:
+                actual_bill["problem"] += (
+                    f"The total 'net' {vat_net} in the VAT breakdown doesn't "
+                    f"match the 'net' {bill.net} of the bill."
+                )
+            if vat_vat != bill.vat:
+                actual_bill["problem"] += (
+                    f"The total VAT {vat_vat} in the VAT breakdown doesn't "
+                    f"match the VAT {bill.vat} of the bill."
+                )
+
             if len(actual_bill["problem"]) > 0:
                 vals["problem"] += "Bills have problems. "
 

chellow/templates/general_imports.html

@@ -306,6 +306,7 @@
 				<td>Type</td>
 				<td>Breakdown</td>
 				<td>Kwh</td>
+				<td>'read' or 'element'</td>
 				<td>(Meter Serial Number</td>
 				<td>Mpan</td>
 				<td>Coefficient</td>
@@ -317,6 +318,12 @@
 				<td>Present Date</td>
 				<td>Present Value</td>
 				<td>Present Type)*</td>
+				<td>'read' or 'element'</td>
+				<td>(Name</td>
+				<td>Start Date</td>
+				<td>Finish Date</td>
+				<td>Net</td>
+				<td>Breakdown)*</td>
 			</tr>
 			<tr>
 				<td><em>update</em></td>

chellow/templates/report_run_bill_check.html

@@ -101,7 +101,7 @@
 			{% for row in rows %}
 				{% set data = row.data['data'] %}
 				{% set properties = row.data.get('properties', {}) %}
-				{% set market_ROLE_Code = data['market_role_code'] %}
+				{% set market_role_code = data['market_role_code'] %}
 				<tr>
 					<td><a href="/report_run_rows/{{row.id}}">View</a></td>
 					<td style="white-space: nowrap">

chellow/templates/report_run_row_bill_check.html

@@ -108,7 +108,12 @@
 					<td>
 						<strong style="color: red">{{bill.problem}}</strong>
 					</td>
-					<td>{{bill.breakdown}}</td>
+					<td>
+						<details>
+							<summary>Breakdown</summary>
+							<pre>{{bill.breakdown}}</pre>
+						</details>
+					</td>
 				</tr>
 			{% endfor %}
 		</tbody>

chellow/views.py

@@ -1389,14 +1389,17 @@ def report_run_get(run_id):
                 )
                 for n in element_names
             ]
-            sum_diffs = g.sess.execute(
-                select(*diff_selects).where(ReportRunRow.report_run == run)
-            ).one()
+            if len(diff_selects) > 0:
+                sum_diffs = g.sess.execute(
+                    select(*diff_selects).where(ReportRunRow.report_run == run)
+                ).one()
 
-            for elem, sum_diff in zip(element_names, sum_diffs):
-                elements.append((elem, sum_diff))
+                for elem, sum_diff in zip(element_names, sum_diffs):
+                    elements.append((elem, sum_diff))
 
-            elements.sort(key=lambda x: 0 if x[1] is None else abs(x[1]), reverse=True)
+                elements.sort(
+                    key=lambda x: 0 if x[1] is None else abs(x[1]), reverse=True
+                )
 
         if "element" in request.values:
             element = req_str("element")

{chellow-1759155233.0.0.dist-info → chellow-1759823276.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1759155233.0.0
+Version: 1759823276.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)
@@ -14,7 +14,7 @@ Requires-Dist: odio==0.0.23
 Requires-Dist: openpyxl==3.1.5
 Requires-Dist: paramiko==3.4.1
 Requires-Dist: pep3143daemon==0.1.0
-Requires-Dist: pg8000==1.31.1
+Requires-Dist: pg8000==1.31.5
 Requires-Dist: pip>=9.0.1
 Requires-Dist: psutil==5.9.5
 Requires-Dist: pympler==1.0.1
@@ -47,7 +47,7 @@ Chellow is a web application for checking UK electricity and gas bills. It's des
 for organizations with high electricity consumption. The software is hosted at
 https://github.com/WessexWater/chellow.
 
-[![Build Status](https://github.com/WessexWater/chellow/workflows/chellow/badge.svg)](https://github.com/WessexWater/chellow/workflows/chellow)
+[![Build Status](https://github.com/WessexWater/chellow/actions/workflows/chellow.yml/badge.svg)](https://github.com/WessexWater/chellow/actions/workflows/chellow.yml)
 
 
 ## Installation
@@ -55,8 +55,7 @@ https://github.com/WessexWater/chellow.
 Chellow is a Python web application that uses the PostgreSQL database. To install
 Chellow, follow these steps:
 
-* Install [PostgreSQL](http://www.postgresql.org/) 12
-  * Set the PostgreSQL time zone to 'UTC'.
+* Install [PostgreSQL](http://www.postgresql.org/) 15
 * Create a PostgreSQL database: `createdb --encoding=UTF8 chellow`
 * Set up the following environment variables to configure Chellow:
 

{chellow-1759155233.0.0.dist-info → chellow-1759823276.0.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=dixp-O0MF2_mlwrnKx3D9DH09Qu05BjTo0rZfigTjR4,5534
 chellow/edi_lib.py,sha256=Lq70TUJuogoP5KGrphzUEUfyfgftEclg_iA3mpNAaDI,51324
 chellow/fake_batch_updater.py,sha256=khAmvSUn9qN04w8C92kRg1UeyQvfLztE7QXv9tUz6nE,11611
-chellow/general_import.py,sha256=bm8FoaC9xUajGvJYShuS5GEwPwcL5eCF9D9g6o_AkB0,68089
+chellow/general_import.py,sha256=ghybbden66VT4q5J0vYwiNg-6G2vg71EgCN_x3fvhW0,69200
 chellow/models.py,sha256=Ws3-jP6x3bSrCmv1umbviaQ3SijpP4R_a6i2Go26gRM,247072
 chellow/national_grid.py,sha256=-c_vqNRtpNIQOcm0F1NDhS3_QUiOaLgEJYWzysSNc5Y,4369
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
@@ -13,7 +13,7 @@ chellow/rate_server.py,sha256=RwJo-AzBIdzxx7PAtboZEUH1nUjAeJckw0bk06-9oyM,5672
 chellow/rrun.py,sha256=sWm_tuJ_6xH3T28TY1w63k1Q44N_S_p_pYF5YCeztqU,2226
 chellow/testing.py,sha256=Dj2c1NX8lVlygueOrh2eyYawLW6qKEHxNhXVVUaNRO0,3637
 chellow/utils.py,sha256=i3GQK9MIcweosZk2gi-nX_IFq2DxURAJDyNoLBg6YwM,19421
-chellow/views.py,sha256=sEWt-CcVl4YPe7raAGXforkoIdfM6ofiBt6aQdmKFV4,85978
+chellow/views.py,sha256=9IUUbYjqEmQQzbYQB4w-ygCo25gecIxYVbxTXRF-YfY,86078
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
 chellow/e/bill_importer.py,sha256=mEW4s_P5tp81uf1cYWCKcr5DW1EkeRi0JUHy9caz5mI,10353
@@ -78,7 +78,7 @@ chellow/gas/transportation.py,sha256=uWFh0v-ViA02nH9Vof9JG3PiyAPXwhYZ1SvPxuzsQ0I
 chellow/gas/views.py,sha256=GeCvi6BGTUN7bu7sVkypNckwG3Crl6AbUcRob9qMi0E,59733
 chellow/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/reports/report_109.py,sha256=Exb-FQ5f70-ier_h15CgHGysQ7vJ7k3gFZ1001zM3iM,11171
-chellow/reports/report_111.py,sha256=mLU56iUir-YKpuYIA-LqEo2ipsoYtF_HlvRtGz1xD5s,24545
+chellow/reports/report_111.py,sha256=LNrSqXb_oIShjWj5KewciAc2KCtOZiSIVr4lhZkif1I,26168
 chellow/reports/report_169.py,sha256=wortJyvgXTrnjjXhLzqwaksKKu63K5IgdzU5f4SkHMI,9246
 chellow/reports/report_181.py,sha256=ypfYWYVNC1X2fMlJyDzwNiNTTRrpPW49DirXE_xDKa0,4958
 chellow/reports/report_183.py,sha256=fGONpKEIXTqIT_3dE5jZKBIesWPgLq-chHO6X22dIv0,8768
@@ -128,7 +128,7 @@ chellow/templates/downloads.html,sha256=R9QPcFz-PLJOX7rDlmquIk-Hp9Iq-thzWCTfOexS
 chellow/templates/edi_viewer.html,sha256=szUthgHOdph6Of-7f_1LeC_zYlNJaMeS5ctn6xTAeiM,1437
 chellow/templates/fake_batch_updater.html,sha256=aRQbxtNUlIzxwgSUy2pr-Km5NbhZkse4WSBtlqFIJMg,1885
 chellow/templates/general_import.html,sha256=9ezzieDjaPBZ0nUJkMkzoDxWVzYtr4D-Dr2UCA5xV8U,1370
-chellow/templates/general_imports.html,sha256=-uQRJBtpwZHODcWM1JuECJ_H_AHsu8frtwEFQ6s_7Sk,13690
+chellow/templates/general_imports.html,sha256=h7UC7AWJ3Qw9PH8UPq24PqZ5xQF5b3Ct7LfC_PK78BE,13866
 chellow/templates/home.html,sha256=7xiD6QLju3ugALzMlzTJosRyMUmQGWPK6jDF7oZbnAQ,5781
 chellow/templates/input_date.html,sha256=rpgB5n0LfN8Y5djN_ZiuSxqdskxzCoKrEqI7hyJkVQo,1248
 chellow/templates/local_report.html,sha256=pV7_0QwyQ-D3OS9LXrly5pq3qprZnwTCoq6vCnMTkS4,1332
@@ -146,13 +146,13 @@ chellow/templates/object_summary.html,sha256=VGCAAYcWTzgNfL0mxEef2Fa8dP3FcBhzj0f
 chellow/templates/rate_server.html,sha256=SezuwdKhHRZ00-R_S6ttKiZ-nvRpwozV9QcIMf9StG8,5360
 chellow/templates/report_run.html,sha256=O_wjIu43S-mKVyZyku3dJJdvyck3rAgEdhw59TsCcK0,4040
 chellow/templates/report_run_asset_comparison.html,sha256=VYCCUmIC7Mfe7uuaAHb6ihiK6zsqeTlQbzgtzLqR3zg,2305
-chellow/templates/report_run_bill_check.html,sha256=G2hGKD_Gh3_zo67EMirYAJ0iz8IXF9CaKwiZ49E7n6o,4505
+chellow/templates/report_run_bill_check.html,sha256=gLeQbDb6AayGR-gvDq5v7M-XxEkNA6f0PO6-NP-UjPU,4505
 chellow/templates/report_run_ecoes_comparison.html,sha256=EYjmdiQ14lt_CW7e6mdyQYec1t-rg8g85wFb1757YpI,4812
 chellow/templates/report_run_g_bill_check.html,sha256=tOXl_mjR__foYKiOYflJbK-459actAtjzv8rfuL3TwM,4851
 chellow/templates/report_run_missing_e_bills.html,sha256=l5idQhfaNhMvvzIRv-iqCpeDnYl_wgs6-mZMBOmuyR8,2447
 chellow/templates/report_run_monthly_duration_org.html,sha256=gGNGJ4Q50q4BtIMi98rhO-7NqRHcsFUmbj2qzeOLejw,1713
 chellow/templates/report_run_row.html,sha256=bmtcdqJaS1CXpL0i8PuqvmeF98jKNYX5-mnQu-OuDKQ,3791
-chellow/templates/report_run_row_bill_check.html,sha256=olLzCvllJsPyXgs3f2V9G1N1w_KVmi_7tSqMF9TE9QM,8011
+chellow/templates/report_run_row_bill_check.html,sha256=JzedUA9R4-0jnonnoluV7CYCnzGsSAPFQtEVgMt6GTc,8105
 chellow/templates/report_run_row_g_bill_check.html,sha256=2Ym9mkwvA_DGDrgktDDwXQXlUK7tR2aR3gp3KUqMLoI,7017
 chellow/templates/report_run_supply_contacts.html,sha256=JNzwz9M6qbLRDMkCzFCxxANapUer5klxo7t5a48nAzg,2117
 chellow/templates/report_runs.html,sha256=ecoIkl2WtfYtifiTxnslmpMGYYGVQW-CVSBpqhXyiE4,1131
@@ -399,6 +399,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-1759155233.0.0.dist-info/METADATA,sha256=qzWyoZ51hskEgNCLUswUI7miFb3QIbshyX4o37JeaXc,12519
-chellow-1759155233.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1759155233.0.0.dist-info/RECORD,,
+chellow-1759823276.0.0.dist-info/METADATA,sha256=FByd2AG_PHGsgs27uxDhVTHa9U52X14rX8HGh4X7aVo,12500
+chellow-1759823276.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1759823276.0.0.dist-info/RECORD,,