summaryrefslogtreecommitdiff
path: root/addons/delivery/models/stock_picking.py
diff options
context:
space:
mode:
Diffstat (limited to 'addons/delivery/models/stock_picking.py')
-rw-r--r--addons/delivery/models/stock_picking.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py
index ac1e0846ca0..9c1b93440c2 100644
--- a/addons/delivery/models/stock_picking.py
+++ b/addons/delivery/models/stock_picking.py
@@ -75,9 +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()
+
+ if self.carrier_id:
self._add_delivery_cost_to_so()
- elif self.carrier_id and self.carrier_id.delivery_type in ['fixed', 'base_on_rule'] and self.carrier_id.shipping_enabled:
- self.carrier_price = sum(self.sale_id.order_line.filtered(lambda r: r.is_delivery).mapped('price_unit'))
return res