From 810d800043496a7a973256a4bd06ea53e2959ca4 Mon Sep 17 00:00:00 2001
From: Maxime Richez <mrichez@saluc.com>
Date: Thu, 22 Feb 2024 00:06:28 +0100
Subject: [PATCH] Do not enforce empty shipment cost method on cancelled state

Closes #13018
(grafted from af89389ef1162e862980c2f380efc1fd1d760f79)

--HG--
branch : 7.0
---
 modules/sale_shipment_cost/sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/sale_shipment_cost/sale.py b/modules/sale_shipment_cost/sale.py
index 6d61d270d4..7c61fc93ad 100644
--- a/modules/sale_shipment_cost/sale.py
+++ b/modules/sale_shipment_cost/sale.py
@@ -80,7 +80,7 @@ class Sale(metaclass=PoolMeta):
             ('shipment', "On Shipment"),
             ], "Shipment Cost Method",
         domain=[
-            If(~Eval('carrier') & (Eval('state') != 'draft'),
+            If(~Eval('carrier') & ~Eval('state').in_(['draft', 'cancelled']),
                 ('shipment_cost_method', '=', None),
                 ()),
             ],