diff --git a/addons/mrp/views/mrp_bom_views.xml b/addons/mrp/views/mrp_bom_views.xml
index 0976ec7876a..d1241b291ab 100644
--- a/addons/mrp/views/mrp_bom_views.xml
+++ b/addons/mrp/views/mrp_bom_views.xml
@@ -31,6 +31,7 @@
         <record id="mrp_bom_form_view" model="ir.ui.view">
             <field name="name">mrp.bom.form</field>
             <field name="model">mrp.bom</field>
+            <field name="priority">100</field>
             <field name="arch" type="xml">
                 <form string="Bill of Material">
                     <sheet>
@@ -222,6 +223,7 @@
                     <group>
                         <group string="Product">
                             <field name="product_id"/>
+                            <field name="parent_product_tmpl_id" invisible="1"/>
                             <label for="product_qty" string="Quantity"/>
                             <div class="o_row">
                                 <field name="product_qty"/>
diff --git a/addons/mrp/wizard/mrp_product_produce_views.xml b/addons/mrp/wizard/mrp_product_produce_views.xml
index d246c31874d..89fb9216471 100644
--- a/addons/mrp/wizard/mrp_product_produce_views.xml
+++ b/addons/mrp/wizard/mrp_product_produce_views.xml
@@ -40,46 +40,6 @@
                                 <field name="product_uom_id" readonly="1" force_save="1" groups="uom.group_uom"/>
                                 <field name="move_id" invisible="1"/>
                             </tree>
-                            <kanban class="o_kanban_mobile">
-                                <field name="product_id"/>
-                                <field name="lot_id"/>
-                                <field name="qty_to_consume"/>
-                                <field name="qty_reserved"/>
-                                <field name="qty_done"/>
-                                <field name="product_uom_id"/>
-                                <templates>
-                                    <t t-name="kanban-box">
-                                        <div t-attf-class="oe_kanban_global_click">
-                                            <div class="o_kanban_record_top">
-                                                <div class="o_kanban_record_headings">
-                                                    <strong class="o_kanban_record_title"><span><field name="product_id"/></span></strong>
-                                                </div>
-                                            </div>
-                                            <div class="o_kanban_record_body">
-                                                <span>Lot <field name="lot_id"/></span><br/>
-                                                <span>Quantity To Consume <field name="qty_to_consume"/></span><br/>
-                                                <span>Quantity Reserved <field name="qty_reserved"/></span><br/>
-                                                <span>Quantity Done <field name="qty_done"/></span><br/>
-                                            </div>
-                                        </div>
-                                    </t>
-                                </templates>
-                            </kanban>
-                            <form>
-                                <group>
-                                    <group>
-                                        <field name="company_id" invisible="1"/>
-                                        <field name="product_id"/>
-                                        <field name="product_tracking" invisible="1"/>
-                                        <field name="lot_id" />
-                                        <field name="qty_to_consume" readonly="1" />
-                                        <field name="qty_reserved" readonly="1" force_save="1" optional="show"/>
-                                        <field name="qty_done"/>
-                                        <field name="product_uom_id" readonly="1" force_save="1" groups="uom.group_uom"/>
-                                        <field name="move_id" invisible="1"/>
-                                    </group>
-                                </group>
-                            </form>
                         </field>
                     </group>
                     <h4 attrs="{'invisible': [('finished_workorder_line_ids', '=', [])]}">By-products</h4>
@@ -107,6 +67,62 @@
             </field>
         </record>
 
+        <record id="mrp_product_produce_line_form" model="ir.ui.view">
+            <field name="name">MRP Product Produce Line</field>
+            <field name="model">mrp.product.produce.line</field>
+            <field name="priority">100</field>
+            <field name="arch" type="xml">
+                <form>
+                    <group>
+                        <group>
+                            <field name="company_id" invisible="1"/>
+                            <field name="product_id"/>
+                            <field name="product_tracking" invisible="1"/>
+                            <field name="lot_id" attrs="{'readonly': [('product_tracking', '=', 'none')]}" context="{'default_product_id': product_id}" groups="stock.group_production_lot"/>
+                            <field name="qty_to_consume" readonly="1" force_save="1"/>
+                            <field name="qty_reserved" readonly="1" force_save="1" optional="show"/>
+                            <field name="qty_done"/>
+                            <field name="product_uom_id" readonly="1" force_save="1" groups="uom.group_uom"/>
+                            <field name="move_id" invisible="1"/>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="mrp_product_produce_line_kanban" model="ir.ui.view">
+            <field name="name">MRP Product Produce Line</field>
+            <field name="model">mrp.product.produce.line</field>
+            <field name="priority">100</field>
+            <field name="arch" type="xml">
+                <kanban class="o_kanban_mobile">
+                    <field name="product_id"/>
+                    <field name="lot_id"/>
+                    <field name="qty_to_consume"/>
+                    <field name="qty_reserved"/>
+                    <field name="qty_done"/>
+                    <field name="product_uom_id"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_global_click">
+                                <div class="o_kanban_record_top">
+                                    <div class="o_kanban_record_headings">
+                                        <strong class="o_kanban_record_title"><span><field name="product_id"/></span></strong>
+                                    </div>
+                                </div>
+                                <div class="o_kanban_record_body">
+                                    <span>Lot <field name="lot_id"/></span><br/>
+                                    <span>Quantity To Consume <field name="qty_to_consume"/></span><br/>
+                                    <span>Quantity Reserved <field name="qty_reserved"/></span><br/>
+                                    <span>Quantity Done <field name="qty_done"/></span><br/>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
         <record id="act_mrp_product_produce" model="ir.actions.act_window">
             <field name="name">Produce</field>
             <field name="type">ir.actions.act_window</field>