From fe85d408312de74ba7ef6ff3a085ea4a9baf6bb4 Mon Sep 17 00:00:00 2001 From: Richard Mathot Date: Mon, 7 Dec 2015 16:55:21 +0100 Subject: [PATCH] [FIX] delivery: correct 3df1ff5a9b21a06ede9fbbaa047124156863a1a5 --- addons/delivery/models/stock_picking.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py index 9b4e51ff55e..1cb9ed88b04 100644 --- a/addons/delivery/models/stock_picking.py +++ b/addons/delivery/models/stock_picking.py @@ -75,7 +75,9 @@ class StockPicking(models.Model): if self.carrier_id and self.carrier_id.delivery_type not in ['fixed', 'base_on_rule'] and self.carrier_id.shipping_enabled: self.send_to_shipper() - self._add_delivery_cost_to_so() + + if self.carrier_id: + self._add_delivery_cost_to_so() return res