summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--addons/delivery/models/sale_order.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/delivery/models/sale_order.py b/addons/delivery/models/sale_order.py
index d1100ecbde9..3deac3f4c5f 100644
--- a/addons/delivery/models/sale_order.py
+++ b/addons/delivery/models/sale_order.py
@@ -56,7 +56,10 @@ class SaleOrder(models.Model):
carrier = self.carrier_id
else:
name = _('Add a shipping method')
- carrier = self.with_company(self.company_id).partner_shipping_id.property_delivery_carrier_id
+ carrier = (
+ self.with_company(self.company_id).partner_shipping_id.property_delivery_carrier_id
+ or self.with_company(self.company_id).partner_shipping_id.commercial_partner_id.property_delivery_carrier_id
+ )
return {
'name': name,
'type': 'ir.actions.act_window',