Avoid errors with merged stock owners

app/controllers/schemes_controller.rb

@@ -119,7 +119,8 @@ class SchemesController < ApplicationController
 
     if @scheme.errors.empty? && @scheme.save
       if @scheme.owning_organisation.merge_date.present?
-        @scheme.scheme_deactivation_periods.create!(deactivation_date: @scheme.owning_organisation.merge_date)
+        deactivation = SchemeDeactivationPeriod.new(scheme: @scheme, deactivation_date: @scheme.owning_organisation.merge_date)
+        deactivation.save!(validate: false)
       end
       redirect_to scheme_primary_client_group_path(@scheme)
     else

app/helpers/schemes_helper.rb

@@ -20,11 +20,14 @@ module SchemesHelper
   end
 
   def owning_organisation_options(current_user)
-    all_orgs = Organisation.visible.map { |org| OpenStruct.new(id: org.id, name: org.name) }
-    user_org = [OpenStruct.new(id: current_user.organisation_id, name: current_user.organisation.name)]
-    stock_owners = current_user.organisation.stock_owners.visible.map { |org| OpenStruct.new(id: org.id, name: org.name) }
-    merged_organisations = current_user.organisation.absorbed_organisations.visible.merged_during_open_collection_period.map { |org| OpenStruct.new(id: org.id, name: org.name) }
-    current_user.support? ? all_orgs : user_org + stock_owners + merged_organisations
+    if current_user.support?
+      Organisation.visible.map { |org| OpenStruct.new(id: org.id, name: org.name) }
+    else
+      user_org = [current_user.organisation]
+      stock_owners = current_user.organisation.stock_owners.visible.filter { |org| org.status == :active || (org.status == :merged && org.merge_date >= FormHandler.instance.start_date_of_earliest_open_for_editing_collection_period) }
+      merged_organisations = current_user.organisation.absorbed_organisations.visible.merged_during_open_collection_period
+      (user_org + stock_owners + merged_organisations).map { |org| OpenStruct.new(id: org.id, name: org.name) }
+    end
   end
 
   def null_option