[IMP] Take into account returned move in auto force assign the correct way

bzr revid: jco@openerp.com-20140220140506-velvy6yxliyujmtk
This commit is contained in:
Josse Colpaert 2014-02-20 15:05:06 +01:00
parent e88ef88dae
commit 526353db3c
1 changed files with 5 additions and 2 deletions

View File

@ -1848,10 +1848,13 @@ class stock_move(osv.osv):
for move in self.browse(cr, uid, ids, context=context):
if move.state not in ('confirmed', 'waiting', 'assigned'):
continue
if move.product_id.type == 'consu' or (move.picking_type_id and move.picking_type_id.auto_force_assign):
if move.picking_type_id and move.picking_type_id.auto_force_assign:
to_assign_moves.append(move.id)
if move.product_id.type == 'consu' or (not move.origin_returned_move_id):
if not move.origin_returned_move_id:
continue
if move.product_id.type == 'consu':
to_assign_moves.append(move.id)
continue
else:
todo_moves.append(move)
#build the prefered domain based on quants that moved in previous linked done move