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

@@ -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 ''