[MERGE] from upstream

bzr revid: fva@openerp.com-20131113175835-6s1go0ril6bqiyu3
This commit is contained in:
Frédéric van der Essen
2013-11-13 18:58:35 +01:00
+1 -1
View File
@@ -979,7 +979,7 @@ class stock_picking(osv.osv):
quant_obj.quants_unreserve(cr, uid, move, context=context)
res2[move.id] = move.product_qty
resneg[move.id] = {}
if move.state == 'assigned':
if move.state in ('confirmed', 'assigned'):
products_moves.setdefault(move.product_id.id, []).append(move)