Adjust dates

app/models/validations/sales/setup_validations.rb

@@ -45,12 +45,12 @@ module Validations::Sales::SetupValidations
     return unless record.saledate && record.owning_organisation
 
     if record.owning_organisation.present?
-      if record.owning_organisation&.merge_date.present? && record.owning_organisation.merge_date < record.saledate
+      if record.owning_organisation&.merge_date.present? && record.owning_organisation.merge_date <= record.saledate
         record.errors.add :owning_organisation_id, I18n.t("validations.setup.owning_organisation.inactive_merged_organisation",
                                                           owning_organisation: record.owning_organisation.name,
                                                           owning_organisation_merge_date: record.owning_organisation.merge_date.to_formatted_s(:govuk_date),
                                                           owning_absorbing_organisation: record.owning_organisation.absorbing_organisation.name)
-      elsif record.owning_organisation&.absorbed_organisations.present? && record.owning_organisation.created_at > record.saledate
+      elsif record.owning_organisation&.absorbed_organisations.present? && record.owning_organisation.created_at.to_date > record.saledate.to_date
         record.errors.add :owning_organisation_id, I18n.t("validations.setup.owning_organisation.inactive_absorbing_organisation",
                                                           owning_organisation: record.owning_organisation.name,
                                                           owning_organisation_available_from: record.owning_organisation.created_at.to_formatted_s(:govuk_date))
@@ -100,10 +100,10 @@ private
   end
 
   def merged_owning_organisation_inactive?(record)
-    record.owning_organisation&.merge_date.present? && record.owning_organisation.merge_date < record.saledate
+    record.owning_organisation&.merge_date.present? && record.owning_organisation.merge_date <= record.saledate
   end
 
   def absorbing_owning_organisation_inactive?(record)
-    record.owning_organisation&.absorbed_organisations.present? && record.owning_organisation.created_at > record.saledate
+    record.owning_organisation&.absorbed_organisations.present? && record.owning_organisation.created_at.to_date > record.saledate.to_date
   end
 end