From 3fe4efe4e4090e4159d26eab7cc92d7a7ae52e3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
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
(grafted from 83baf33015e42627c3fcebc8e1becac41c1260b1)

--HG--
branch : 7.0
---
 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 35f1a62097..5dcbfeaf3b 100644
--- a/modules/web_shop_shopify/sale.py
+++ b/modules/web_shop_shopify/sale.py
@@ -302,12 +302,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