diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index e77070a1756..cbc94763be0 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -509,7 +509,7 @@ class stock_picking(osv.osv):
     def force_assign(self, cr, uid, ids, *args):
         wf_service = netsvc.LocalService("workflow")
         for pick in self.browse(cr, uid, ids):
-            move_ids = [x.id for x in pick.move_lines if x.state in ['confirmed','auto']]
+            move_ids = [x.id for x in pick.move_lines if x.state in ['confirmed','waiting']]
 #            move_ids = [x.id for x in pick.move_lines]
             self.pool.get('stock.move').force_assign(cr, uid, move_ids)
             wf_service.trg_write(uid, 'stock.picking', pick.id, cr)