diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 2745532e31e..e77070a1756 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -509,8 +509,8 @@ 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 == 'confirmed']
-            move_ids = [x.id for x in pick.move_lines]
+            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]
             self.pool.get('stock.move').force_assign(cr, uid, move_ids)
             wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
         return True
diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index 38424f52852..45b9134c966 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -59,6 +59,8 @@ def _get_moves(self, cr, uid, data, context):
     _moves_arch_lst = ['<?xml version="1.0"?>', '<form string="Make packing">']
 
     for m in pick.move_lines:
+        if m.state in ('done', 'cancel'):
+            continue
         quantity = m.product_qty
         if m.state<>'assigned':
             quantity = 0