[MERGE]:lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa-work_order-mma

bzr revid: apa@tinyerp.com-20120504072137-ticbd1wnl4zosr0e

diff --cc addons/mrp_operations/mrp_operations.py
index 78deb68,0bec075..bf6ff56
--- 1/addons/mrp_operations/mrp_operations.py
--- 2/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@@ -86,7 -86,7 +86,7 @@@ class mrp_production_workcenter_line(os
      _order = "sequence, date_planned"
  
      _columns = {
-        'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pending'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True,
 -       'state': fields.selection([('draft','Draft'),('pause','Pending'),('startworking', 'In Progress'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True,
++       'state': fields.selection([('draft','Draft'),('cancel','Cancelled'),('pause','Pending'),('startworking', 'In Progress'),('done','Finished')],'State', readonly=True,
                                   help="* When a work order is created it is set in 'Draft' state.\n" \
                                         "* When user sets work order in start mode that time it will be set in 'In Progress' state.\n" \
                                         "* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pending' state.\n" \