diff --git a/app/models/validations/sales/setup_validations.rb b/app/models/validations/sales/setup_validations.rb index d52af8f9b..240528712 100644 --- a/app/models/validations/sales/setup_validations.rb +++ b/app/models/validations/sales/setup_validations.rb @@ -25,6 +25,7 @@ module Validations::Sales::SetupValidations end def validate_merged_organisations_saledate(record) + return unless FeatureToggle.merge_organisations_enabled? return unless record.saledate && date_valid?("saledate", record) if merged_owning_organisation_inactive?(record) @@ -42,6 +43,7 @@ module Validations::Sales::SetupValidations end def validate_organisation(record) + return unless FeatureToggle.merge_organisations_enabled? return unless record.saledate && record.owning_organisation if record.owning_organisation.present?