From 25c20bb2105b2e69c4c68d24678dcee3770f38ee Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Wed, 10 Jul 2013 12:30:17 +0200 Subject: [PATCH] [WIP] Grouping of stock moves + stock_location should first check must precise procurement rule on _assign bzr revid: jco@openerp.com-20130710103017-d4p2bz0fvpn3reo9 --- addons/stock_location/stock_location.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py index f93dca4b679..495e7fad04f 100644 --- a/addons/stock_location/stock_location.py +++ b/addons/stock_location/stock_location.py @@ -168,7 +168,7 @@ class stock_move(osv.osv): location_obj = self.pool.get("stock.location") quant_obj = self.pool.get("stock.quant") for move in self.browse(cr, uid, ids, context=context): - putaways = location_obj.get_putaway_strategy(cr, uid, move.location_dest_id.id, context=context)#putaway_obj.search(cr, uid, [('product_categ_id','=', move.product_id.categ_id.id), ('location_id', '=', move.location_dest_id.id)], context=context) + putaways = location_obj.get_putaway_strategy(cr, uid, move.location_dest_id.id, move.product_id.id, context=context)#putaway_obj.search(cr, uid, [('product_categ_id','=', move.product_id.categ_id.id), ('location_id', '=', move.location_dest_id.id)], context=context) if putaways: #Search for locations for PutAway locs = location_obj.search(cr, uid, [('id', 'child_of', move.location_dest_id.id), ('id', '!=', move.location_dest_id.id), ('quant_ids', '=', False), @@ -225,10 +225,6 @@ class stock_location(osv.osv): strats = self.search_removals(cr, uid, location.id, categ.id, context=context) categ = categ.parent_id return strats and strats[0] or super(stock_location, self).get_removal_strategy(cr, uid, id, product_id, context=context) - - - - return super(stock_location, self).get_removal_strategy(cr, uid, id, product_id, context=context)