From f0ed54fc46841d569ae8b59398781bae9a0d1569 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Tue, 3 Nov 2015 13:53:29 +0100 Subject: [PATCH] [FIX] delivery: shipping cost on delivery order If the delivery method chosen is NOT an external provider (such as Fedex, UPS...), the shipping cost is not set on the delivery order. This fix will search for any shipping cost on the associated sale order and will update the shipping cost accordingly on the delivery order. opw-653328 --- addons/delivery/models/stock_picking.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py index cb12c8ef2e0..f2ac8fb110b 100644 --- a/addons/delivery/models/stock_picking.py +++ b/addons/delivery/models/stock_picking.py @@ -76,6 +76,8 @@ 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() + 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