diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 2d40c4d2f82..7c47548a4f6 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -5,10 +5,10 @@
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
             groups="group_mrp_user,group_mrp_manager" sequence="3"/>
         <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
-		<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
+        <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
 
         <menuitem name="Control" id="menu_mrp_control" parent="base.menu_mrp_root"  sequence="3" />
-     	<menuitem name="Master Data"
+        <menuitem name="Master Data"
                   id="menu_mrp_bom"
                   parent="base.menu_mrp_root"
                   sequence="5" />
@@ -929,6 +929,7 @@
                 <tree string="Minimum Stock Rules">
                     <field name="name"/>
                     <field name="warehouse_id"/>
+                    <field name="location_id"/>
                     <field name="product_id"/>
                     <field name="product_uom"/>
                     <field name="product_min_qty"/>
@@ -943,11 +944,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Minimum Stock Rules Search">
-                    <field name="name" select="1" />
-                    <field name="warehouse_id" select="1" widget="selection"/>
-                    <field name="location_id" select="1" />
-                    <field name="company_id" select="1" widget="selection"/>
-                    <field name="product_id" select="1"/>
+                    <group col="10" colspan="4">
+                        <field name="name" select="1" />
+                        <field name="warehouse_id" select="1" widget="selection"/>
+                        <field name="location_id" select="1" />
+                        <field name="company_id" select="1" widget="selection"/>
+                        <field name="product_id" select="1"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="4" col="10">
+                        <filter string="Warehouse" icon="terp-stock" domain="[]"  context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Location" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
+                    </group>
                 </search>
             </field>
         </record>