From 1de38fedd2b2839d15d3b040e03091d30ac37274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Fri, 5 Sep 2025 16:52:11 +0200
Subject: [PATCH] Only validate packing for shipments with a shipping service

Closes #14217
---
 modules/stock_package_shipping/stock.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/stock_package_shipping/stock.py b/modules/stock_package_shipping/stock.py
index 8ea107ae7a..1d426eb5df 100644
--- a/modules/stock_package_shipping/stock.py
+++ b/modules/stock_package_shipping/stock.py
@@ -169,7 +169,7 @@ class ShippingMixin:
     def validate(cls, shipments):
         super().validate(shipments)
         for shipment in shipments:
-            if shipment.carrier and shipment.carrier.shipping_service:
+            if shipment.has_shipping_service:
                 method_name = ('validate_packing_%s'
                     % shipment.carrier.shipping_service)
                 validator = getattr(shipment, method_name)
@@ -341,9 +341,10 @@ class CreateShipping(Wizard):
     start = StateTransition()
 
     def transition_start(self):
-        shipping_service = self.record.carrier.shipping_service
-        method_name = 'validate_packing_%s' % shipping_service
-        getattr(self.record, method_name)()
+        if self.record.has_shipping_service:
+            shipping_service = self.record.carrier.shipping_service
+            method_name = 'validate_packing_%s' % shipping_service
+            getattr(self.record, method_name)()
         return 'end'