Add more time helpers

app/helpers/collection_time_helper.rb

@@ -23,4 +23,12 @@ module CollectionTimeHelper
   def current_collection_end_date
     Time.zone.local(current_collection_start_year + 1, 3, 31)
   end
+
+  def next_collection_start_year
+    current_collection_start_year + 1
+  end
+
+  def previous_collection_start_year
+    current_collection_start_year - 1
+  end
 end

app/models/form_handler.rb

@@ -35,8 +35,8 @@ class FormHandler
   def sales_forms
     {
       "current_sales" => Form.new(nil, current_collection_start_year, SALES_SECTIONS, "sales"),
-      "previous_sales" => Form.new(nil, current_collection_start_year - 1, SALES_SECTIONS, "sales"),
+      "previous_sales" => Form.new(nil, previous_collection_start_year, SALES_SECTIONS, "sales"),
-      "next_sales" => Form.new(nil, current_collection_start_year + 1, SALES_SECTIONS, "sales"),
+      "next_sales" => Form.new(nil, next_collection_start_year, SALES_SECTIONS, "sales"),
     }
   end
 
@@ -52,10 +52,10 @@ class FormHandler
     end
 
     if forms["previous_lettings"].blank? && current_collection_start_year >= 2022
-      forms["previous_lettings"] = Form.new(nil, current_collection_start_year - 1, LETTINGS_SECTIONS, "lettings")
+      forms["previous_lettings"] = Form.new(nil, previous_collection_start_year, LETTINGS_SECTIONS, "lettings")
     end
     forms["current_lettings"] = Form.new(nil, current_collection_start_year, LETTINGS_SECTIONS, "lettings") if forms["current_lettings"].blank?
-    forms["next_lettings"] = Form.new(nil, current_collection_start_year + 1, LETTINGS_SECTIONS, "lettings") if forms["next_lettings"].blank?
+    forms["next_lettings"] = Form.new(nil, next_collection_start_year, LETTINGS_SECTIONS, "lettings") if forms["next_lettings"].blank?
 
     forms
   end

app/models/validations/sales/setup_validations.rb

@@ -4,7 +4,7 @@ module Validations::Sales::SetupValidations
   def validate_saledate(record)
     return unless record.saledate && date_valid?("saledate", record)
 
-    unless record.saledate.between?(Time.zone.local(2022, 4, 1), Time.zone.local(2023, 3, 31)) || !FeatureToggle.saledate_collection_window_validation_enabled?
+    unless record.saledate.between?(current_collection_start_date, current_collection_end_date) || !FeatureToggle.saledate_collection_window_validation_enabled?
       record.errors.add :saledate, I18n.t("validations.setup.saledate.financial_year")
     end
   end