From 7153bca65780da6836f015eff997e53177356e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 17 Sep 2025 15:21:54 +0200 Subject: [PATCH] Update sale addresses also for guest party from Shopify order If the guest party is set back because the customer has been removed on Shopify, the addresses must be also set back to those from the guest party. Closes #14235 --- modules/web_shop_shopify/sale.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/web_shop_shopify/sale.py b/modules/web_shop_shopify/sale.py index 43e7d4314d..f22393b2b4 100644 --- a/modules/web_shop_shopify/sale.py +++ b/modules/web_shop_shopify/sale.py @@ -84,17 +84,20 @@ class Sale(IdentifierMixin, metaclass=PoolMeta): order.shipping_address) else: shipment_address = None - if shipment_address: - setattr_changed(sale, 'shipment_address', shipment_address) if getattr(order, 'billing_address', None): invoice_address = party.get_address_from_shopify( order.billing_address) else: invoice_address = None - if invoice_address or shipment_address: - setattr_changed( - sale, 'invoice_address', - invoice_address or shipment_address) + else: + shipment_address = sale.party.address_get(type='delivery') + invoice_address = sale.party.address_get(type='invoice') + + if shipment_address: + setattr_changed(sale, 'shipment_address', shipment_address) + if invoice_address or shipment_address: + setattr_changed( + sale, 'invoice_address', invoice_address or shipment_address) if not party.addresses: address = Address(party=party)