From 27e674fa362e0da2a120c1041d68d175c0c0cdf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 16 Apr 2025 09:41:11 +0200 Subject: [PATCH] Merge company into party name for Shopify address Since a28904ce28d5 the address name has been replaced by building name. It was a mistake to use the address name for the company name of Shopify address. So instead we merge the name and company of Shopify address into the party name of the Tryton address. --- modules/web_shop_shopify/party.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/web_shop_shopify/party.py b/modules/web_shop_shopify/party.py index 128f3a6718..53bb28c7ec 100644 --- a/modules/web_shop_shopify/party.py +++ b/modules/web_shop_shopify/party.py @@ -63,7 +63,9 @@ class Address(metaclass=PoolMeta): values = {} values['party_name'] = remove_forbidden_chars(address.name or '') - values['name'] = remove_forbidden_chars(address.company or '') + if address.company: + values['party_name'] += ( + f'({remove_forbidden_chars(address.company)})') values['street'] = '\n'.join(filter(None, [ address.address1, address.address2])) values['city'] = remove_forbidden_chars(address.city or '') @@ -92,7 +94,6 @@ class Address(metaclass=PoolMeta): def shopify_values(self): values = {} values['party_name'] = self.party_name or '' - values['name'] = self.name or '' values['street'] = self.street or '' values['city'] = self.city or '' values['postal_code'] = self.postal_code or ''