diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-12-10 13:05:58 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-12-10 13:05:58 +0100 |
| commit | 82a495eed52a9f42e5b88caa52c20a85f8d81ce3 (patch) | |
| tree | 6c5e8cc0247d5fe08d24e9abae38fe353fbebc56 /addons/delivery/models | |
| parent | 0bc2ddae784bf80c4c809d8b7f6d642d576f92a1 (diff) | |
| parent | 4022493c0b85f966e499b6c03ac7cce5556f15e6 (diff) | |
[MERGE] forward port of branch saas-7 up to 4022493
Diffstat (limited to 'addons/delivery/models')
| -rw-r--r-- | addons/delivery/models/stock_move.py | 5 | ||||
| -rw-r--r-- | addons/delivery/models/stock_picking.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/addons/delivery/models/stock_move.py b/addons/delivery/models/stock_move.py index 7a809e70b86..5dea1dd82ac 100644 --- a/addons/delivery/models/stock_move.py +++ b/addons/delivery/models/stock_move.py @@ -35,5 +35,8 @@ class StockMove(models.Model): for proc in procs_to_check: pickings = (proc.move_ids.mapped('picking_id')).filtered(lambda record: not record.carrier_id) if pickings: - pickings.write({'carrier_id': proc.sale_line_id.order_id.carrier_id.id}) + pickings.write({ + 'carrier_id': proc.sale_line_id.order_id.carrier_id.id, + 'carrier_price': proc.sale_line_id.order_id.delivery_price, + }) return res 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 |