From 7c611a49581b6a732f9834eb6e831702c30faf33 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Thu, 17 Sep 2015 10:27:31 +0200 Subject: [PATCH] [FIX] stock: fix default values of stock picking (mixing up old and new API) --- addons/stock/stock.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index cfa2dfd51dd..f4a87efbe5a 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -897,18 +897,16 @@ class stock_picking(models.Model): return res def _default_location_destination(self): - context = self._context or {} - if context.get('default_picking_type_id', False): - pick_type = self.env['stock.picking.type'].browse(context['default_picking_type_id']) - return pick_type.default_location_dest_id and pick_type.default_location_dest_id.id or False - return False + # retrieve picking type from context; if none this returns an empty recordset + picking_type_id = self._context.get('default_picking_type_id') + picking_type = self.env['stock.picking.type'].browse(picking_type_id) + return picking_type.default_location_dest_id def _default_location_source(self): - context = self._context or {} - if context.get('default_picking_type_id', False): - pick_type = self.env['stock.picking.type'].browse(context['default_picking_type_id']) - return pick_type.default_location_src_id and pick_type.default_location_src_id.id or False - return False + # retrieve picking type from context; if none this returns an empty recordset + picking_type_id = self._context.get('default_picking_type_id') + picking_type = self.env['stock.picking.type'].browse(picking_type_id) + return picking_type.default_location_src_id _columns = { 'name': fields.char('Reference', select=True, states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}, copy=False),