diff --git a/odoo/addons/base/models/res_partner.py b/odoo/addons/base/models/res_partner.py index ad7d8d5ff2e..b6d5c03ee04 100644 --- a/odoo/addons/base/models/res_partner.py +++ b/odoo/addons/base/models/res_partner.py @@ -662,6 +662,8 @@ class Partner(models.Model): name = name + "\n" + partner._display_address(without_company=True) name = name.replace('\n\n', '\n') name = name.replace('\n\n', '\n') + if self._context.get('partner_show_db_id'): + name = "%s (%s)" % (name, partner.id) if self._context.get('address_inline'): name = name.replace('\n', ', ') if self._context.get('show_email') and partner.email: diff --git a/odoo/addons/base/tests/test_res_partner.py b/odoo/addons/base/tests/test_res_partner.py index 743303ac100..f739819af45 100644 --- a/odoo/addons/base/tests/test_res_partner.py +++ b/odoo/addons/base/tests/test_res_partner.py @@ -40,3 +40,12 @@ class TestPartner(TransactionCase): with self.assertRaises(UserError, msg="You should not be able to update the company_id of the partner company if the linked user of a child partner is not an allowed to be assigned to that company"), self.cr.savepoint(): test_partner_company.write({'company_id': company_2.id}) + + def test_partner_merge_wizard_dst_partner_id(self): + """ Check that dst_partner_id in merge wizard displays id along with partner name """ + test_partner = self.env['res.partner'].create({'name': 'Radu the Handsome'}) + expected_partner_name = '%s (%s)' % (test_partner.name, test_partner.id) + + partner_merge_wizard = self.env['base.partner.merge.automatic.wizard'].with_context( + {'partner_show_db_id': True, 'default_dst_partner_id': test_partner}).new() + self.assertEqual(partner_merge_wizard.dst_partner_id.display_name, expected_partner_name, "'Destination Contact' name should contain db ID in brackets") diff --git a/odoo/addons/base/wizard/base_partner_merge_views.xml b/odoo/addons/base/wizard/base_partner_merge_views.xml index 51376dcdf88..0903f200bca 100644 --- a/odoo/addons/base/wizard/base_partner_merge_views.xml +++ b/odoo/addons/base/wizard/base_partner_merge_views.xml @@ -55,7 +55,11 @@ You can remove contacts from this list to avoid merging them.

- +