diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index a575f677661..2bf2c7a16ed 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -209,11 +209,13 @@
             <field name="arch" type="xml">
                 <tree string="Stock and Sales Forecasts" editable="bottom">
                     <field name="warehouse_id"/>
+                    <field name ="company_id"/>
                     <field name="user_id"/>
                     <field name="period_id"/>
                     <field name="product_id" on_change="product_id_change(product_id)" />
                     <field name="product_qty"/>
                     <field name="product_uom" />
+                    
                 </tree>
             </field>
         </record>
@@ -238,14 +240,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Stock and Sales Forecast">
-                 <group col='10' colspan='4'>
                     <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" separator="1"/>
-                    <field name="company_id" widget="selection"/>
-                    <field name="warehouse_id" widget="selection"/>
-                    <field name="period_id" widget="selection"/>
+                    <field name="company_id"/>
+                    <field name="warehouse_id" />
+                    <field name="period_id" />
                     <field name="product_id"/>
                     <field name="create_uid"/>
-                </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}"/>
+                        <filter string="Warehouse " icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" />
+                    </group>
               </search>
             </field>
         </record>
@@ -382,14 +390,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Stock Planning">
-                 <group col='10' colspan='4'>
-<!--  Doesn't work !       <filter icon="terp-purchase" string="Current" domain="[('line_time','=','Future')]" separator="1"/>  -->
                     <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" separator="1"/>
                     <field name="company_id" widget="selection"/>
                     <field name="warehouse_id" widget="selection"/>
                     <field name="period_id" widget="selection"/>
                     <field name="product_id"/>
-                 </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}"/>
+                        <filter string="Warehouse " icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
+                       <separator orientation="vertical"/>
+                    </group>                 
               </search>
             </field>
         </record>