chellow 1714396467.0.0__py3-none-any.whl → 1714470909.0.0__py3-none-any.whl

chellow/general_import.py

@@ -374,10 +374,14 @@ def general_import_era(sess, action, vals, args):
         ssc_code = add_arg(args, "Standard Settlement Configuration", vals, 12)
         if ssc_code == NO_CHANGE:
             ssc = existing_era.ssc
+            if ssc is None:
+                ssc_code = None
+            else:
+                ssc_code = ssc.code
         elif len(ssc_code) > 0:
-            ssc = Ssc.get_by_code(sess, ssc_code)
+            Ssc.get_by_code(sess, ssc_code)
         else:
-            ssc = None
+            ssc_code = None
 
         es_code = add_arg(args, "Energisation Status", vals, 13)
         if es_code == NO_CHANGE:
@@ -513,7 +517,7 @@ def general_import_era(sess, action, vals, args):
             mtc_code,
             cop,
             comm,
-            ssc,
+            ssc_code,
             energisation_status,
             properties,
             imp_mpan_core,

chellow/reports/report_ecoes_comparison.py

@@ -436,8 +436,9 @@ def _process(
                     diffs.append("supplier")
 
                 dc_contract = era.dc_contract
-                if dc_contract is None:
-                    chellow_dc = ""
+                chellow_dc_props = dc_contract.make_properties()
+                if "nhh_participant" in chellow_dc_props:
+                    chellow_dc = chellow_dc_props["nhh_participant"]
                 else:
                     chellow_dc = dc_contract.party.participant.code
 

{chellow-1714396467.0.0.dist-info → chellow-1714470909.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1714396467.0.0
+Version: 1714470909.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-1714396467.0.0.dist-info → chellow-1714470909.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=5SmP-0QPK6xCkd_wjIWh_8FAzN5OxNHCzyEQ1Xb-Y-M,5256
 chellow/edi_lib.py,sha256=het3R0DBGtXEo-Sy1zvXQuX9EWQ1X6Y33G4l1hYYuds,51859
-chellow/general_import.py,sha256=xx4R0kQ6WKIty1UdXoF0igGJQZGm9lDNGynMi7LP0k8,65700
+chellow/general_import.py,sha256=FuDinyFxWJ22plUojTaH6wchU-5AQuHuaI_RjVEeJi8,65818
 chellow/models.py,sha256=POIL0dfwZFuqht7xHZaE6KJ7fk4kxMZC2aXzgg5kEFY,236921
 chellow/national_grid.py,sha256=uxcv0qisHPyzw9AVIYPzsRqwt2XPAcZL-SBR12qcrS0,4364
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
@@ -92,7 +92,7 @@ chellow/reports/report_bills.py,sha256=AHW6tiZAOE0gXDfencPvemE4zqK6eTqfN8_bWQ4RT
 chellow/reports/report_csv_llfcs.py,sha256=OHSbP64lQ6dlAMcQYgvdANlA4lQyF0iBlwk7V9c9nuo,1944
 chellow/reports/report_csv_site_hh_data.py,sha256=T-clGDmYdn0ej7zZfL3kDp4Vyd82WzptxEzxx9KqAZg,4270
 chellow/reports/report_csv_site_snags.py,sha256=gG2sYQrLoIBwCoMUC8rhmAL7Kffh_rvNb9UOX7cYDko,2668
-chellow/reports/report_ecoes_comparison.py,sha256=hx4kb_y-5HKiSihFiAw2ZAQQM0mC_LOX6aXRSzvGnIs,21292
+chellow/reports/report_ecoes_comparison.py,sha256=C7LhYMdOeIH9-jEY6OF_gypQ0WVD2Y9HQiRnhJTt0lo,21408
 chellow/reports/report_g_monthly_duration.py,sha256=vI5FKAU8_oThjR5oflPZont7Z7sVAunr0qlMfJsaPJI,12004
 chellow/reports/report_g_supplies_snapshot.py,sha256=0M0x_0o0985Hu45gUJJJwzfx0DDOAuXBJ1UVUDbQ36g,4718
 chellow/reports/report_g_supply_virtual_bill.py,sha256=x_KtQ02dwgmXvAEUXJ1poK0BRwqxa-GcbJ5pddEina0,3694
@@ -363,6 +363,6 @@ chellow/templates/g/supply_note_edit.html,sha256=6UQf_qbhFDys3cVsTp-c7ABWZpggW9R
 chellow/templates/g/supply_notes.html,sha256=WR3YwGh_qqTklSJ7JqWX6BKBc9rk_jMff4RiWZiF2CM,936
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1714396467.0.0.dist-info/METADATA,sha256=XqwlSvE3Utq6wDib3BS7MXDzgbiVIf8ZIZkNzTdbTCM,12205
-chellow-1714396467.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-chellow-1714396467.0.0.dist-info/RECORD,,
+chellow-1714470909.0.0.dist-info/METADATA,sha256=PSjGjb6-c3psTPFGyoKg-bktL3qTUbDmXUpzJrQkVDQ,12205
+chellow-1714470909.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+chellow-1714470909.0.0.dist-info/RECORD,,