From 75657b5484a83615252d83df50232acec5b54c25 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Tue, 4 Apr 2023 16:03:06 +0200
Subject: [PATCH] =?UTF-8?q?correctif(administrateur.merge):=20la=20fusion?=
 =?UTF-8?q?=20de=20compte=20entre=20admin=20devrait=20dissocie=20les=20ser?=
 =?UTF-8?q?vices=20des=20procedures=20supprim=C3=A9es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/administrateur.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/administrateur.rb b/app/models/administrateur.rb
index 323ac1725..ceaa23db2 100644
--- a/app/models/administrateur.rb
+++ b/app/models/administrateur.rb
@@ -118,7 +118,7 @@ class Administrateur < ApplicationRecord
     old_services.each do |old_service|
       corresponding_service = new_service_by_nom[old_service.nom]
       if corresponding_service.present?
-        old_service.procedures.update_all(service_id: corresponding_service.id)
+        old_service.procedures.with_discarded.update_all(service_id: corresponding_service.id)
         old_service.destroy
       else
         old_service.update_column(:administrateur_id, id)