From 9e35833672d678f86d77e8f36fe996e11d759aa5 Mon Sep 17 00:00:00 2001 From: Richard Mathot Date: Wed, 18 Nov 2015 12:23:55 +0100 Subject: [PATCH] [FIX] delivery: A return picking should not copy the carrier of its originating picking. Furthermore, we do not support returns in our shipping providers integrations. Maybe one day... --- addons/delivery/models/stock_picking.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py index f2ac8fb110b..75ce85ca45c 100644 --- a/addons/delivery/models/stock_picking.py +++ b/addons/delivery/models/stock_picking.py @@ -114,3 +114,17 @@ class StockPicking(models.Model): msg = "Shipment %s cancelled" % self.carrier_tracking_ref self.message_post(body=msg) self.carrier_tracking_ref = False + + +class StockReturnPicking(models.TransientModel): + _inherit = 'stock.return.picking' + + @api.multi + def _create_returns(self): + # Prevent copy of the carrier and carrier price when generating return picking + # (we have no integration of returns for now) + new_picking, pick_type_id = super(StockReturnPicking, self)._create_returns() + picking = self.env['stock.picking'].browse(new_picking) + picking.write({'carrier_id': False, + 'carrier_price': 0.0}) + return new_picking, pick_type_id