summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Mathot <rim@odoo.com>2015-12-07 16:55:21 +0100
committerRichard Mathot <rim@odoo.com>2015-12-07 16:55:21 +0100
commitfe85d408312de74ba7ef6ff3a085ea4a9baf6bb4 (patch)
tree7efe48ce461375069d62a9cee728e7e2dd8c529c
parent3df1ff5a9b21a06ede9fbbaa047124156863a1a5 (diff)
[FIX] delivery: correct 3df1ff5a9b21a06ede9fbbaa047124156863a1a5
-rw-r--r--addons/delivery/models/stock_picking.py4
1 files changed, 3 insertions, 1 deletions
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