From 91baffb746ff700d96bea352b24123ac58c5611e Mon Sep 17 00:00:00 2001
From: Florian Damhaut <flda@odoo.com>
Date: Thu, 20 Jul 2023 13:25:23 +0200
Subject: [PATCH] [IMP] data_merge: merge company_dependent fields

Merge company_dependent fields when merginf base_partner

closes odoo/odoo#129175

Task-id: 3103035
Related: odoo/enterprise#44401
Signed-off-by: Sofie Gvaladze (sgv) <sgv@odoo.com>
---
 odoo/addons/base/wizard/base_partner_merge.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/odoo/addons/base/wizard/base_partner_merge.py b/odoo/addons/base/wizard/base_partner_merge.py
index f93a470b08d..d3988d97245 100644
--- a/odoo/addons/base/wizard/base_partner_merge.py
+++ b/odoo/addons/base/wizard/base_partner_merge.py
@@ -229,6 +229,24 @@ class MergePartnerAutomatic(models.TransientModel):
 
         self.env.flush_all()
 
+        # Company-dependent fields
+        with self._cr.savepoint():
+            params = {
+                'destination_id': f'res.partner,{dst_partner.id}',
+                'source_ids': tuple(f'res.partner,{src}' for src in src_partners.ids),
+            }
+            self._cr.execute("""
+        UPDATE ir_property AS _ip1
+        SET res_id = %(destination_id)s
+        WHERE res_id IN %(source_ids)s
+        AND NOT EXISTS (
+             SELECT
+             FROM ir_property AS _ip2
+             WHERE _ip2.res_id = %(destination_id)s
+             AND _ip2.fields_id = _ip1.fields_id
+             AND _ip2.company_id = _ip1.company_id
+        )""", params)
+
     def _get_summable_fields(self):
         """ Returns the list of fields that should be summed when merging partners
         """