From 030ba411a2522849323ef18b9bd9b38f87e38cbb Mon Sep 17 00:00:00 2001 From: Richard Mathot Date: Mon, 7 Dec 2015 16:31:41 +0100 Subject: [PATCH] [REV 2394d267febe6a1e7a1802e6bcdea2cda2e87c4a. Merged too fast. Sorry for the disturbance. --- addons/delivery/models/stock_picking.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py index 5d985166fce..75ce85ca45c 100644 --- a/addons/delivery/models/stock_picking.py +++ b/addons/delivery/models/stock_picking.py @@ -73,11 +73,9 @@ class StockPicking(models.Model): self.ensure_one() res = super(StockPicking, self).do_transfer() - if self.carrier_id: - self._add_delivery_cost_to_so() - 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() 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'))