diff --git a/app/models/derived_variables/lettings_log_variables.rb b/app/models/derived_variables/lettings_log_variables.rb index a1dc09332..4327469dc 100644 --- a/app/models/derived_variables/lettings_log_variables.rb +++ b/app/models/derived_variables/lettings_log_variables.rb @@ -102,7 +102,6 @@ module DerivedVariables::LettingsLogVariables self.uprn = nil self.uprn_known = 0 self.uprn_confirmed = nil - self.uprn_selection = nil self.address_line1 = nil self.address_line2 = nil self.town_or_city = nil @@ -357,7 +356,6 @@ private self.uprn = nil self.uprn_known = nil self.uprn_confirmed = nil - self.uprn_selection = nil self.address_line1 = nil self.address_line2 = nil self.town_or_city = nil diff --git a/app/models/derived_variables/sales_log_variables.rb b/app/models/derived_variables/sales_log_variables.rb index 3b5f6209d..81ad177e4 100644 --- a/app/models/derived_variables/sales_log_variables.rb +++ b/app/models/derived_variables/sales_log_variables.rb @@ -241,7 +241,6 @@ private def reset_address_fields! self.uprn = nil self.uprn_known = nil - self.uprn_selection = nil self.address_line1 = nil self.address_line2 = nil self.town_or_city = nil diff --git a/app/models/validations/property_validations.rb b/app/models/validations/property_validations.rb index 1cf710857..f051a65db 100644 --- a/app/models/validations/property_validations.rb +++ b/app/models/validations/property_validations.rb @@ -50,7 +50,7 @@ module Validations::PropertyValidations end def validate_la_in_england(record) - return unless record.form.start_year_2025_or_later? + return unless record.form.start_year_2025_or_later? || (record.startdate_changed? && record.startdate_was&.year == 2025 && record.startdate.year == 2024) if record.is_general_needs? return unless record.la diff --git a/app/models/validations/sales/property_validations.rb b/app/models/validations/sales/property_validations.rb index af1ca7c4e..af576c260 100644 --- a/app/models/validations/sales/property_validations.rb +++ b/app/models/validations/sales/property_validations.rb @@ -40,7 +40,7 @@ module Validations::Sales::PropertyValidations end def validate_la_in_england(record) - return unless record.form.start_year_2025_or_later? + return unless record.form.start_year_2025_or_later? || (record.saledate_changed? && record.saledate_was&.year == 2025 && record.saledate.year == 2024) return unless record.la return if record.la.in?(LocalAuthority.england.pluck(:code))