Merge pull request #555 from Hestia-Homes/main

ECO bug fix

asset_list/app.py

@@ -59,6 +59,40 @@ def app():
     Property UPRN
     """
 
+    # PFP
+    data_folder = "/Users/khalimconn-kowlessar/Documents/hestia/Customers/Places For People/Nov 2025 Inspections"
+    data_filename = "Inspections List - PFP  (1).xlsx"
+    sheet_name = "Sheet1"
+    postcode_column = 'Postcode'
+    address1_column = "Address 1"
+    address1_method = None
+    fulladdress_column = None
+    address_cols_to_concat = ["Address 1", "Address 2", "Address 3"]
+    missing_postcodes_method = None
+    landlord_year_built = None
+    landlord_os_uprn = None
+    landlord_property_type = "Archetype"  # Using inspections
+    landlord_built_form = "Archetype 2"  # Using inspections
+    landlord_wall_construction = None
+    landlord_roof_construction = None
+    landlord_heating_system = None
+    landlord_existing_pv = None
+    landlord_property_id = "UPRN"
+    landlord_sap = None
+    outcomes_filename = None
+    outcomes_sheetname = None
+    outcomes_postcode = None
+    outcomes_houseno = None
+    outcomes_id = None
+    outcomes_address = None
+    master_filepaths = []
+    master_id_colnames = []
+    master_to_asset_list_filepath = None
+    phase = False
+    ecosurv_landlords = None
+    asset_list_header = 0
+    landlord_block_reference = None
+
     # Stonewater Solar
     data_folder = "/Users/khalimconn-kowlessar/Documents/hestia/Customers/Stonewater/October 2025 Solar"
     data_filename = "Copy of AP Stonewater Ammended address list - PV AM Amended - Khalim initial review.xlsx"

recommendations/optimiser/funding_optimiser.py

@@ -808,6 +808,9 @@ def _find_measure(input_measures, measure_type):
 def _make_solar_heating_funding_paths(
     p, input_measures, funding_paths, remaining_insulation_type, housing_type, funding: Funding
 ):
+    # If a property is private and EPC D or above, it's not eligible
+    if housing_type == "Private" and p.data["current-energy-rating"] in ["D", "C", "B", "A"]:
+        return funding_paths
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     # Solar PV with existing eligible heating system
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~