[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9798 revid:dle@openerp.com-20140129163238-1s1t9oc814z4z7f3

bzr revid: dle@openerp.com-20140129171022-wf6244k90lpncmah
This commit is contained in:
Denis Ledoux 2014-01-29 18:10:22 +01:00
commit 6cc096aebc
1 changed files with 1 additions and 1 deletions

View File

@ -695,7 +695,7 @@ class purchase_order(osv.osv):
continue
if order_line.product_id.type in ('product', 'consu'):
move = stock_move.create(cr, uid, self._prepare_order_line_move(cr, uid, order, order_line, picking_id, context=context))
if order_line.move_dest_id:
if order_line.move_dest_id and order_line.move_dest_id.state != 'done':
order_line.move_dest_id.write({'location_id': order.location_id.id})
todo_moves.append(move)
stock_move.action_confirm(cr, uid, todo_moves)