diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb index 846b084d4..07765d2ce 100644 --- a/app/models/validations/setup_validations.rb +++ b/app/models/validations/setup_validations.rb @@ -65,6 +65,7 @@ module Validations::SetupValidations return unless record.startdate return unless FeatureToggle.merge_organisations_enabled? + if owning_organisation.present? if owning_organisation&.merge_date.present? && owning_organisation.merge_date <= record.startdate record.errors.add :owning_organisation_id, I18n.t("validations.setup.owning_organisation.inactive_merged_organisation",