diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index c98a15e39ab..55421013ca4 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1070,13 +1070,7 @@ class stock_move(osv.osv):
         self.write(cr, uid, ids, {'state':'cancel', 'move_dest_id': False})
 
         for pick in self.pool.get('stock.picking').browse(cr,uid,pickings.keys()):
-            cancel=False
-            for move in pick.move_lines:
-                if move.state=='cancel':
-                    cancel=True
-                if move.state!='cancel':
-                    cancel=False
-            if cancel:
+            if all(move.state == 'cancle' for move in pick.move_lines):
                 self.pool.get('stock.picking').write(cr,uid,[pick.id],{'state':'cancel'}) 
 
         wf_service = netsvc.LocalService("workflow")