From 19fbcc1edae2f110199a0fd015f9f3a01f19cc45 Mon Sep 17 00:00:00 2001 From: "Michael (mcm)" Date: Wed, 8 Feb 2023 13:01:49 +0000 Subject: [PATCH] [FIX] base: remove empty lines from name_get Before this commit, name_get of the res.partner model could return the partner's name + its address but with empty lines if some address elements were not set. Now, these empty line are removed which makes the address cleaner. closes odoo/odoo#113039 Task: 2759019 X-original-commit: c3745be816b1bf9ecd38184307452f93326ef36f Signed-off-by: Vincent Schippefilt (vsc) --- odoo/addons/base/models/res_partner.py | 5 ++--- odoo/addons/base/tests/test_res_partner.py | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/odoo/addons/base/models/res_partner.py b/odoo/addons/base/models/res_partner.py index 6f9bb8edb82..7d8e7adbd2a 100644 --- a/odoo/addons/base/models/res_partner.py +++ b/odoo/addons/base/models/res_partner.py @@ -809,8 +809,7 @@ class Partner(models.Model): name = self._get_contact_name(partner, name) if self._context.get('show_address'): name = name + "\n" + partner._display_address(without_company=True) - name = name.replace('\n\n', '\n') - name = name.replace('\n\n', '\n') + name = re.sub(r'\s+\n', '\n', name) if self._context.get('partner_show_db_id'): name = "%s (%s)" % (name, partner.id) if self._context.get('address_inline'): @@ -820,7 +819,7 @@ class Partner(models.Model): name = "%s <%s>" % (name, partner.email) if self._context.get('show_vat') and partner.vat: name = "%s ‒ %s" % (name, partner.vat) - return name + return name.strip() def name_get(self): res = [] diff --git a/odoo/addons/base/tests/test_res_partner.py b/odoo/addons/base/tests/test_res_partner.py index 579d2d005ee..aed55bfc929 100644 --- a/odoo/addons/base/tests/test_res_partner.py +++ b/odoo/addons/base/tests/test_res_partner.py @@ -34,9 +34,9 @@ class TestPartner(TransactionCase): test_partner_bhide = self.env['res.partner'].create({'name': 'Atmaram Bhide'}) res_jetha = test_partner_jetha.with_context(show_address=1).name_get() - self.assertEqual(res_jetha[0][1], "Jethala\nPowder gali\nGokuldham Society\n \n", "name should contain comma separated name and address") + self.assertEqual(res_jetha[0][1], "Jethala\nPowder gali\nGokuldham Society", "name should contain comma separated name and address") res_bhide = test_partner_bhide.with_context(show_address=1).name_get() - self.assertEqual(res_bhide[0][1], "Atmaram Bhide\n \n", "name should contain only name if address is not available, without extra commas") + self.assertEqual(res_bhide[0][1], "Atmaram Bhide", "name should contain only name if address is not available, without extra commas") res_jetha = test_partner_jetha.with_context(show_address=1, address_inline=1).name_get() self.assertEqual(res_jetha[0][1], "Jethala, Powder gali, Gokuldham Society", "name should contain comma separated name and address")