[REV 2394d267fe.

Merged too fast. Sorry for the disturbance.
2015-12-07 16:31:41 +01:00
parent 2394d267fe
commit 030ba411a2
1 changed files with 1 additions and 3 deletions
@@ -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'))