From 549370459daf917d8272e3899136cfc549de3ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 7 Jul 2025 11:20:12 +0200 Subject: [PATCH] Set shipment cost method on Shopify sale only if a carrier is set Closes #14105 --- modules/web_shop_shopify/sale.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/web_shop_shopify/sale.py b/modules/web_shop_shopify/sale.py index 6aa908e5c8..50e6ab0aea 100644 --- a/modules/web_shop_shopify/sale.py +++ b/modules/web_shop_shopify/sale.py @@ -316,12 +316,13 @@ class Sale_ShipmentCost(metaclass=PoolMeta): sale = super().get_from_shopify(shop, order, sale=sale) - sale.shipment_cost_method = 'order' + sale.shipment_cost_method = None if order.shipping_lines: available_carriers = sale.on_change_with_available_carriers() if available_carriers: sale.carrier = available_carriers[0] if sale.carrier: + sale.shipment_cost_method = 'order' for line in sale.lines: if getattr(line, 'shipment_cost', None) is not None: unit_price = line.unit_price