From 8bc244101c03b1e4b168e78d0efe3202054adfdb Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 11 Dec 2023 09:16:55 +0000 Subject: [PATCH] Remove old collection managed sales validation --- app/services/merge/merge_organisations_service.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/services/merge/merge_organisations_service.rb b/app/services/merge/merge_organisations_service.rb index 147a1a094..be28e97c5 100644 --- a/app/services/merge/merge_organisations_service.rb +++ b/app/services/merge/merge_organisations_service.rb @@ -130,7 +130,12 @@ private end merging_organisation.managed_sales_logs.after_date(@merge_date.to_time).each do |sales_log| sales_log.managing_organisation = @absorbing_organisation - sales_log.save!(validate: false) + if sales_log.collection_period_open? + sales_log.skip_dpo_validation = true + sales_log.save! + else + sales_log.save!(validate: false) + end end end