diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index dd7552dec86..fa97b5d0d73 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -484,7 +484,23 @@
                             <field colspan="4" name="move_created_ids" nolabel="1"/>
                         </page>
                         <page string="Work Orders">
-                            <field colspan="4" name="workcenter_lines" nolabel="1" widget="one2many_list"/>
+                            <field colspan="4" name="workcenter_lines" nolabel="1">
+                                <form string="Production Workcenters">
+                                    <field colspan="4" name="name" select="1"/>
+                                    <field colspan="4" name="workcenter_id" select="1"/>
+                                    <field name="sequence"/>
+                                    <field name="cycle"/>
+                                    <field name="hour"/>
+                                </form>
+                                <tree string="Production Workcenters">
+                                    <field name="sequence"/>
+                                    <field name="name"/>
+                                    <field name="workcenter_id"/>
+                                    <field name="cycle"/>
+                                    <field name="hour"/>
+                                </tree>
+                            </field>
+
                         </page>
                         <page string="Extra Information">
                             <field name="priority" groups="base.group_extended"/>
@@ -561,35 +577,6 @@
         </record>
         <menuitem action="mrp_production_new" id="menu_production_orders_new" parent="mrp.menu_mrp_production_action"/>
 
-        <record id="mrp_production_workcenter_form_view" model="ir.ui.view">
-            <field name="name">mrp.production.workcenter.line.form</field>
-            <field name="model">mrp.production.workcenter.line</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Production Workcenters">
-                    <field colspan="4" name="name" select="1"/>
-                    <field colspan="4" name="workcenter_id" select="1"/>
-                    <field name="sequence"/>
-                    <field name="cycle"/>
-                    <field name="hour"/>
-                </form>
-            </field>
-        </record>
-        <record id="mrp_production_workcenter_tree_view" model="ir.ui.view">
-            <field name="name">mrp.production.workcenter.line.tree</field>
-            <field name="model">mrp.production.workcenter.line</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Production Workcenters">
-                    <field name="sequence"/>
-                    <field name="name"/>
-                    <field name="workcenter_id"/>
-                    <field name="cycle"/>
-                    <field name="hour"/>
-                </tree>
-            </field>
-        </record>
-
         <record id="mrp_production_lot_form_view" model="ir.ui.view">
             <field name="name">mrp.production.lot.line.form</field>
             <field name="model">mrp.production.lot.line</field>
diff --git a/addons/mrp_operations/__init__.py b/addons/mrp_operations/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/mrp_operations/__terp__.py b/addons/mrp_operations/__terp__.py
old mode 100755
new mode 100644
diff --git a/addons/mrp_operations/mrp_operation_data.xml b/addons/mrp_operations/mrp_operation_data.xml
old mode 100755
new mode 100644
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
old mode 100755
new mode 100644
index d8014b19f17..93ce9ec56fe
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -40,14 +40,13 @@ from mx import DateTime
 
 class mrp_production_workcenter_line(osv.osv):
     _inherit = 'mrp.production.workcenter.line'
-    _name = 'mrp.production.workcenter.line'
-    _description = 'Production workcenters used'
     _columns = {
        'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Canceled'),('done','Finished')],'Status', readonly=True),
        'date_planned': fields.related('production_id', 'date_planned', type='datetime', string='Date Planned'),
        'date_start': fields.datetime('Start Date'),
        'date_finnished': fields.datetime('End Date'),
        'delay': fields.char('Delay',size=128,help="This is delay between operation start and stop in this workcenter",readonly=True),
+       'production_state':fields.related('production_id','state',type='char',string='Prod.State'),
        'product':fields.related('production_id','product_id',type='many2one',relation='product.product',string='Product'),
        'qty':fields.related('production_id','product_qty',type='float',string='Qty'),
        'uom':fields.related('production_id','product_uom',type='many2one',relation='product.uom',string='UOM'),
@@ -60,9 +59,12 @@ class mrp_production_workcenter_line(osv.osv):
     def modify_production_order_state(self,cr,uid,ids,action):
         wf_service = netsvc.LocalService("workflow")
         oper_obj=self.browse(cr,uid,ids)[0]
-        prod_obj=self.pool.get('mrp.production').browse(cr,uid,[oper_obj.production_id.id])[0]
+        prod_obj=oper_obj.production_id
         if action=='start':
-               if prod_obj.state =='ready':
+               if prod_obj.state =='confirmed':
+                   self.pool.get('mrp.production').force_production(cr, uid, [prod_obj.id])
+                   wf_service.trg_validate(uid, 'mrp.production', prod_obj.id, 'button_produce', cr)
+               elif prod_obj.state =='ready':
                    wf_service.trg_validate(uid, 'mrp.production', prod_obj.id, 'button_produce', cr)
                elif prod_obj.state =='in_production':
                    return
diff --git a/addons/mrp_operations/mrp_operations_report.xml b/addons/mrp_operations/mrp_operations_report.xml
old mode 100755
new mode 100644
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
old mode 100755
new mode 100644
index 1a84e3cfcf8..6d0ac9bcee3
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -3,30 +3,39 @@
 <data>
 
     <record model="ir.ui.view" id="mrp_production_workcenter_tree_view_inherit">
-        <field name="name">mrp.production.workcenter.line.inherit.tree</field>
+        <field name="name">mrp.production.workcenter.line.tree</field>
         <field name="model">mrp.production.workcenter.line</field>
-        <field name="inherit_id" ref="mrp.mrp_production_workcenter_tree_view"/>
         <field name="type">tree</field>
+        <field name="inherit_id" eval="False"/>
         <field name="arch" type="xml">
-            <field name="hour" position="after">
-                <field name="state" />
+            <tree string="Work Orders">
                 <field name="production_id"/>
                 <field name="product"/>
                 <field name="qty"/>
                 <field name="uom"/>
+                <field name="name"/>
+                <field name="workcenter_id"/>
+                <field name="cycle"/>
+                <field name="hour"/>
+                <field name="state" />
                 <button name="button_start_working" string="Start working" states="draft,pause"/>
                 <button name="button_done" string="Finished" states="startworking"/>
-            </field>
+            </tree>
         </field>
     </record>
 
     <record model="ir.ui.view" id="mrp_production_workcenter_form_view_inherit">
-        <field name="name">mrp.production.workcenter.line.form.inherit</field>
+        <field name="name">mrp.production.workcenter.line.form</field>
         <field name="model">mrp.production.workcenter.line</field>
         <field name="type">form</field>
-        <field name="inherit_id" ref="mrp.mrp_production_workcenter_form_view"/>
+        <field name="inherit_id" eval="False"/>
         <field name="arch" type="xml">
-            <field name="hour" position="after">
+            <form string="Work Orders">
+                <field colspan="4" name="name" select="1"/>
+                <field colspan="4" name="workcenter_id" select="1"/>
+                <field name="sequence"/>
+                <field name="cycle"/>
+                <field name="hour"/>
                 <field name="production_id"/>
                 <field name="delay"/>
                 <group colspan="8" col="8">
@@ -38,7 +47,7 @@
                     <button name="button_pause" string="Pause" states="startworking"/>
                     <button name="button_cancel" string="Cancel" states="draft,startworking"/>
                 </group>
-            </field>
+            </form>
         </field>
     </record>
 
@@ -72,7 +81,7 @@
     <!-- Action for tree view of workcenter line   -->
 
     <record model="ir.actions.act_window" id="mrp_production_wc_action_form">
-        <field name="name">Work Order</field>
+        <field name="name">Work Orders</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">mrp.production.workcenter.line</field>
         <field name="view_type">form</field>
@@ -83,7 +92,7 @@
     <!-- Action for All Operations   -->
 
     <record model="ir.actions.act_window" id="mrp_production_wc_action">
-        <field name="name">All Work Order</field>
+        <field name="name">All Work Orders</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">mrp.production.workcenter.line</field>
         <field name="view_type">form</field>
@@ -93,18 +102,18 @@
     <!-- Action for Confirm Operations   -->
 
     <record model="ir.actions.act_window" id="mrp_production_wc_confirm_action">
-        <field name="name">Confirm Work Order</field>
+        <field name="name">Confirmed Work Orders</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">mrp.production.workcenter.line</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,graph,gantt,calendar</field>
-        <field name="domain">[('state','=','confirm')]</field>
+        <field name="domain">[('production_state','=','ready')]</field>
     </record>
 
     <!-- Action for Draft Operations   -->
 
     <record model="ir.actions.act_window" id="mrp_production_wc_draft_action">
-        <field name="name">Draft Work Order</field>
+        <field name="name">Future Work Orders</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">mrp.production.workcenter.line</field>
         <field name="view_type">form</field>
@@ -115,15 +124,15 @@
     <record model="ir.values" id="mrp_production_wc_action_open">
         <field name="key2" eval="'tree_but_open'"/>
         <field name="model" eval="'mrp.production.workcenter.line'"/>
-        <field name="name">Work Order</field>
+        <field name="name">Work Orders</field>
         <field name="value" eval="'ir.actions.act_window,'+str(mrp_production_wc_action_form)"/>
         <field name="object" eval="True"/>
 
     </record>
 
-    <menuitem name="All Work Order" parent="mrp.menu_mrp_root" id="menu_mrp_production_wc_action" action="mrp_production_wc_action"/>
+    <menuitem name="All Work Orders" parent="mrp.menu_mrp_root" id="menu_mrp_production_wc_action" action="mrp_production_wc_action"/>
     <menuitem name="Work Orders to Do" parent="menu_mrp_production_wc_action" action="mrp_production_wc_confirm_action" id="menu_mrp_production_wc_confirm_action"/>
-    <menuitem name="Waiting Work Orders" parent="menu_mrp_production_wc_action" action="mrp_production_wc_draft_action" id="menu_mrp_production_wc_draft_action"/>
+    <menuitem name="Future Work Orders" parent="menu_mrp_production_wc_action" action="mrp_production_wc_draft_action" id="menu_mrp_production_wc_draft_action"/>
 
 <!-- Operation codes -->
 
diff --git a/addons/mrp_operations/mrp_operations_workflow.xml b/addons/mrp_operations/mrp_operations_workflow.xml
old mode 100755
new mode 100644