diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 85c0a733a2c..e0867ba6e8f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -484,37 +484,31 @@
 
                             <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
-                                <tree string="Products to Consume" colors="red:location_dest_id&lt;&gt;parent.location_dest_id">
-                                    <field name="product_id" />
-                                    <field name="product_qty" />
-                                    <field name="product_uom" />
-                                    <field name="state" invisible="1" />
-                                    <button
-                                        name="%(stock.move_consume)d"
-                                        string="Consume Products" type="action"
-                                        icon="gtk-go-forward" context="{'consume': True}"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-justify-fill" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
+                                <tree string="Products to Consume">
+                                    <field name="product_id" select="1"/>
+				                    <field name="product_qty" select="1" string="Qty"/>
+				                    <field name="product_uom" select="1" string="UOM"/>
+				                    <button name="%(stock.move_consume)d"
+				                    	string="Consume Products" type="action"
+				                    	icon="gtk-go-forward" context="{'consume': True}"
+				                    	states="draft,waiting,confirmed,assigned" />
+				                    <button name="%(stock.move_scrap)d"
+				                    	string="Scrap Products" type="action"
+				                    	icon="gtk-justify-fill" context="{'scrap': True}"
+				                    	states="draft,waiting,confirmed,assigned" />
+				                    <field name="state"/>
+				                    <field name="location_id" select="1" string="Source" />
+				                    <field name="location_dest_id" select="1" string="Destination"/>
+				                    <field name="prodlot_id" select="1"/>
                                 </tree>
-                                <form string="Products to Consume">
-                                    <field name="product_id" />
-                                    <field name="product_qty" />
-                                    <field name="product_uom" />
-                                </form>
                             </field>
 
                             <field colspan="2" name="move_lines2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
                            			widget="one2many_list" mode="tree,form" height="275">
                            		<tree string="Consumed Products" editable="bottom" colors="red:state=='cancel';black:state=='done';">
                            			<field name="product_id" readonly="1"/>
-                           			<field name="product_qty" readonly="1"/>
-                           			<field name="product_uom" readonly="1" />
-                           			<field name="state" invisible="1" />
-                           			<field name="location_id" readonly="1"/>
-                           			<field name="prodlot_id" />
+                           			<field name="product_qty" select="1" string="Qty"/>
+				                    <field name="product_uom" select="1" string="UOM"/>
                            			<button
                            				name="%(stock.track_line)d"
                            				string="Split in production lots"
@@ -525,12 +519,11 @@
                            				string="Scrap Products" type="action"
                            				icon="gtk-convert"
                            				states="done,cancel" />
+                           			<field name="state"/>
+				                    <field name="location_id" select="1" string="Source" />
+				                    <field name="location_dest_id" select="1" string="Destination"/>
+				                    <field name="prodlot_id" select="1"/>
                            		</tree>
-                           		<form string="Consumed Products">
-                           			<field name="product_id" />
-                           			<field name="product_qty" />
-                           			<field name="product_uom" />
-                           		</form>
                            	</field>
 
                             <group col="9" colspan="4">
@@ -548,25 +541,22 @@
                             <field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list"
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                 <tree string="Products to Finish">
-                                    <field name="product_id" />
-                                    <field name="product_qty" />
-                                    <field name="product_uom" />
-                                    <field name="state" invisible="1" />
-                                    <button
-                                        name="%(stock.move_consume)d"
-                                        string="Consume Products" type="action"
-                                        icon="gtk-go-forward"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-justify-fill" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
+                                    <field name="product_id" select="1"/>
+				                    <field name="product_qty" select="1" string="Qty"/>
+				                    <field name="product_uom" select="1" string="UOM"/>
+				                    <button name="%(stock.move_consume)d"
+				                    	string="Consume Products" type="action"
+				                    	icon="gtk-go-forward" context="{'consume': True}"
+				                    	states="draft,waiting,confirmed,assigned" />
+				                    <button name="%(stock.move_scrap)d"
+				                    	string="Scrap Products" type="action"
+				                    	icon="gtk-justify-fill" context="{'scrap': True}"
+				                    	states="draft,waiting,confirmed,assigned" />
+				                    <field name="state"/>
+				                    <field name="location_id" select="1" string="Source" />
+				                    <field name="location_dest_id" select="1" string="Destination"/>
+				                    <field name="prodlot_id" select="1"/>
                                 </tree>
-                                <form string="Products to Finish">
-                                    <field name="product_id" />
-                                    <field name="product_qty" />
-                                    <field name="product_uom" />
-                                </form>
                             </field>
 
                             <field colspan="2" name="move_created_ids2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
@@ -584,11 +574,6 @@
                            				string="Scrap Products" type="action" icon="gtk-go-forward"
                            				states="done,cancel" />
                            		</tree>
-                           		<form string="Finished Products">
-                           			<field name="product_id" />
-                           			<field name="product_qty" />
-                           			<field name="product_uom" />
-                           		</form>
                            	</field>
                         </page>
                         <page string="Work Orders">