diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index e4e28b6f07c..8f181e285e5 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -729,6 +729,46 @@
                                                 icon="gtk-convert" context="{'scrap': True}"
                                                 states="draft,waiting,confirmed,assigned"/>
                                         </tree>
+                                        <form string="Products to Produce" version="7.0">
+                                            <header>
+                                                    <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_user"/>
+                                                    <button name="action_confirm" states="draft" string="Confirm" type="object" groups="base.group_user"/>
+                                                    <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" groups="base.group_user"/>
+                                                    <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
+                                            </header>
+                                            <group>
+                                                <group>
+                                                    <field name="name" invisible="1"/>
+                                                    <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
+                                                    <field name="type" invisible="1"/>
+                                                    <label for="product_qty"/>
+                                                    <div>
+                                                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                                                        <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
+                                                        <button name="%(stock.move_scrap)d"
+                                                            string="Scrap" type="action"
+                                                            icon="gtk-convert" context="{'scrap': True}"
+                                                            states="draft,waiting,confirmed,assigned"
+                                                            groups="base.group_user"/>
+                                                    </div>
+                                                    <label for="product_uos_qty" groups="product.group_uos"/>
+                                                    <div groups="product.group_uos">
+                                                        <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
+                                                        <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                                                    </div>
+                                                    <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
+                                                </group>
+                                                <group>
+                                                    <field name="create_date" invisible="1"/>
+                                                    <field name="date"/>
+                                                    <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+                                                </group>
+                                                <group string="Locations" groups="stock.group_locations">
+                                                    <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                                    <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
+                                                </group>
+                                            </group>
+                                        </form>
                                     </field>
                                 </group>
                                 <group string="Produced Products">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 4a3dfe9413a..c63c385967e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1288,7 +1288,7 @@
                 <group>
                     <group>
                         <field name="name" invisible="1"/>
-                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
+                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
                         <field name="type" invisible="1"/>
                         <label for="product_qty"/>
                         <div>