diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 9f816d06b11..31540c63e14 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -8,35 +8,24 @@
         <menuitem name="Administrate Cash Moves" parent="menu_lunch" id="menu_lunch_cash" sequence="52" groups="group_lunch_manager"/>
         <menuitem name="Configuration" parent="menu_lunch" id="menu_lunch_config" sequence="53" groups="group_lunch_manager"/>
         
-         <!--View Search to group by Supplier and time-->
-        <record model="ir.ui.view" id="supplier_group_by_month_search_view">
+         <!--View Search to group/filter by Supplier and time-->
+        <record model="ir.ui.view" id="lunch_order_line_search_view">
             <field name="name">Search</field>
             <field name="model">lunch.order.line</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                    <field name="note"/>
-                    <filter name="group_by_supplier" string="By Supplier" context="{'group_by':'supplier'}"/>
+                    <field name="name" filter_domain="['|', ('name', 'ilike', self), ('note', 'ilike', self)]"/>
                     <filter name="not_confirmed" string="Not Received" domain="[('state','!=',('confirmed'))]"/>
                     <filter name="comfirmed" string="Received" domain="[('state','=','confirmed')]"/>
                     <filter name="cancelled" string="Cancelled" domain="[('state','=','cancelled')]"/>
-                    <filter name="group_by_date" string="By Date" context="{'group_by':'date'}"/>
-
-                </search>
-            </field>
-        </record>
-
-        <record id="view_lunch_order_filter" model="ir.ui.view">
-            <field name="name">lunch order list</field>
-            <field name="model">lunch.order.line</field>
-            <field name="arch" type="xml">
-                <search string="Search Lunch Order">
-                    <field name="note"/>
-                    <filter name="group_by_supplier" string="By Supplier" context="{'group_by':'supplier'}"/>
-                    <filter name="not_confirmed" string="Not Confirmed" domain="[('state','!=',('confirmed'))]"/>
-                    <filter name="comfirmed" string="Confirmed" domain="[('state','=','confirmed')]"/>
-                    <filter name="cancelled" string="Cancelled" domain="[('state','=','cancelled')]"/>
-                    <filter name="today" string="Today" domain="[('date','=',time.strftime('%%m-%%d-%%Y'))]"/>
+                    <separator/>
+                    <filter name="today" string="Today" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
+                    <field name="user_id"/>
+                    <group expand="0" string="Group By...">
+                        <filter name="group_by_supplier" string="By Supplier" context="{'group_by':'supplier'}"/>
+                        <filter name="group_by_date" string="By Date" context="{'group_by':'date'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -143,7 +132,7 @@
             <field name="name">Orders by Supplier</field>
             <field name="res_model">lunch.order.line</field>
             <field name="view_mode">tree</field>
-            <field name="search_view_id" ref="view_lunch_order_filter"/>
+            <field name="search_view_id" ref="lunch_order_line_search_view"/>
             <field name="context">{"search_default_group_by_supplier":1, "search_default_today":1}</field>
             <field name="help" type="html">
               <p>
@@ -163,7 +152,7 @@
             <field name="name">Control Suppliers</field>
             <field name="res_model">lunch.order.line</field>
             <field name="view_mode">tree</field>
-            <field name="search_view_id" ref="supplier_group_by_month_search_view"/> 
+            <field name="search_view_id" ref="lunch_order_line_search_view"/> 
             <field name="context">{"search_default_group_by_date":1, "search_default_group_by_supplier":1}</field>
             <field name="help" type="html">
               <p>