diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 207a6b0fe69..c6d9e670b1a 100755
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -101,9 +101,9 @@
         <field name="arch" type="xml">
             	<search string="Search Meetings">
                		<group col="10" colspan="4">
-	               		<filter icon="terp-crm" string="Draft" domain="[('state','=','draft')]" />
-	                    <filter icon="terp-crm" string="Confirmed" domain="[('state','=','done')]" />
-	                    <filter icon="terp-crm" string="My Meetings" domain="[('user_id','=',uid)]" />
+	               		<filter icon="terp-crm" string="Draft" domain="[('state','=','draft')]" help="Draft Meetings"/>
+	                    <filter icon="terp-crm" string="Confirmed" domain="[('state','=','done')]" help="Confirmed Meetings"/>
+	                    <filter icon="terp-crm" string="My Meetings" domain="[('user_id','=',uid)]" help="My Meetings"/>
 	               		<separator orientation="vertical"/>
 	               		<field name="name" select="1" string="Subject"/>
 	               		<field name="partner_id" select="1"/>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index ebdeb8d7521..160b461fa79 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -65,9 +65,9 @@
             <field name="arch" type="xml">
                 <search string="Cases by Section and Type">
                    <group col="10" colspan="4">
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
+                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" help="Cases by Section and Type for this year"/>
                    		<separator orientation="vertical"/>
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
+						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]" help="Cases by Section and Type for this month"/>
 						<separator orientation="vertical"/>
 						<field name="section_id" select="1" widget="selection"/>
                 		<field name="category2_id" select="1"/>
@@ -145,9 +145,9 @@
             <field name="arch" type="xml">
                 <search string="Cases by Section and Stage">
                    <group col="8" colspan="4">
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
+                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" help="Cases by Section and Stage for this year"/>
                    		<separator orientation="vertical"/>
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
+						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]" help="Cases by Section and Stage for this month"/>
 						<separator orientation="vertical"/>
 						<field name="section_id" select="1" widget="selection"/>
                 		<field name="nbr" select="1"/>
@@ -213,9 +213,9 @@
             <field name="arch" type="xml">
                 <search string="Cases by Section, Category and Stage">
                    <group col='8' colspan='4'>
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
+                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" help="Cases by Section, Category and Stage for this year"/>
                    		<separator orientation="vertical"/>
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
+						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]" help="Cases by Section, Category and Stage for this month"/>
 						<separator orientation="vertical"/>
 						<field name="section_id" select="1" widget="selection"/>
 						<field name="nbr" select="1"/>
@@ -295,9 +295,9 @@
             <field name="arch" type="xml">
                 <search string="Search Cases by User">
                    <group col='12' colspan='4'>
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
+                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" help="Cases by User for this year"/>
                    		<separator orientation="vertical"/>
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
+						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]" help="Cases by User for this month"/>
 						<separator orientation="vertical"/>
 						<field name="section_id" select="1" widget="selection"/>
 						<field name="nbr" select="1"/>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index f14736548d5..21f8ad658b4 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -515,12 +515,28 @@
                 </form>
             </field>
         </record>
+        <record id="crm_case_history_search" model="ir.ui.view">
+        <field name="name">crm.case.history.select</field>
+        <field name="model">crm.case.history</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            	<search string="Search Histories">
+               		<filter icon="terp-crm" string="My" domain="[('user_id','=',uid)]" help="My Histories"/>
+               		<separator orientation="vertical"/>
+               		<field name="date" select="1"/>
+                    <field name="user_id" select="1" widget="selection"/>
+                    <field name="case_id" select="1"/>
+                </search>
+        	</field>
+    	</record>
+        
         <record id="crm_case_history-act" model="ir.actions.act_window">
-            <field name="name">All Histories</field>
+            <field name="name">Histories</field>
             <field name="res_model">crm.case.history</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="crm_case_history_tree-view"/>
+            <field name="search_view_id" ref="crm_case_history_search"/>
         </record>
         <menuitem action="crm_case_history-act" id="menu_crm_case_history-act_main" name="Cases Histories" parent="crm.next_id_52"/>
 
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 4638e515db6..60d0603356e 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -166,7 +166,7 @@
             <field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','out')]</field>
             <field name="filter" eval="True"/>
             <field name="context">{'contact_display': 'partner'}</field>
-            <field name="search_view_id" ref="stock.view_stock_delivery_filter"/>
+            <field name="search_view_id" ref="stock.view_picking_out_search"/>
         </record>
 
         <record id="action_picking_tree5" model="ir.actions.act_window">
@@ -178,7 +178,7 @@
             <field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','in')]</field>
             <field name="filter" eval="True"/>
             <field name="context">{'contact_display': 'partner'}</field>
-            <field name="search_view_id" ref="stock.view_stock_delivery_filter"/>
+            <field name="search_view_id" ref="stock.view_picking_in_search"/>
         </record>
         <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="stock.menu_action_picking_tree4" groups="base.group_extended"/>
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 2901ea85c1b..90dc30bd733 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -124,7 +124,9 @@
 			<field name="type">search</field>
 			<field name="arch" type="xml">
 				<search string="Events">
-					<group col="8" colspan="4">
+					<group col="10" colspan="4">
+						<filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Events"/>
+						<separator orientation="vertical"/>
 						<filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Events"/>
 						<filter icon="terp-calendar" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed Events"/>
 						<separator orientation="vertical"/>
@@ -147,7 +149,7 @@
            <field name="search_view_id" ref="view_event_search"/>
        </record>
        
-       <menuitem name="All Events" id="menu_event_event" action="action_event_view" parent="menu_event_main" />	
+       <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="menu_event_main" />	
 
 	<!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
@@ -269,7 +271,9 @@
 			<field name="type">search</field>
 			<field name="arch" type="xml">
 				<search string="Event Registration">
-					<group col="10" colspan="4">
+					<group col="12" colspan="4">
+						<filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Registrations"/>
+						<separator orientation="vertical"/>
 						<filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
 						<filter icon="terp-calendar" string="Confirmed" domain="[('state','in',('open','done'))]" help="Confirmed Registrations"/>
 						<separator orientation="vertical"/>
@@ -292,7 +296,7 @@
 		  <field name="search_view_id" ref="view_registration_search"/>
 		</record>
 		<menuitem
-			name="All Registrations"
+			name="Registrations"
 			id="menu_action_registration" parent="menu_event_main"
 			action="action_registration"/>
 		
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index f80a94a67ff..e0603037b03 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -175,17 +175,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
-                   <group col='8' colspan='4'>
-	                   <filter icon="terp-partner" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheet"/>
-	                   <filter icon="terp-crm" string="My departments timesheets"  domain="[('user_id', 'child_of', [uid])]" help="My Departments Timesheet"/>
+                   <group col="10" colspan="4">
+		                <filter icon="terp-partner" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheet"/>
+		                <filter icon="terp-crm" string="My departments timesheets"  domain="[('user_id', 'child_of', [uid])]" help="My Departments Timesheet"/>
 						<separator orientation="vertical"/>
-                       <field name="state">
+						<filter icon="terp-crm" string="Unvalidated" domain="[('state','&lt;&gt;','done'),('date_to','&lt;',time.strftime('%%Y-%%m-%%d'))]" help="Unvalidated Timesheets"/>
+                       	<separator orientation="vertical"/>
+                       	<field name="state">
                            <filter icon="terp-hr" domain="[('state','=','draft')]" help="Draft Timesheets"/>
                            <filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
-                       </field>
-                       <field name="name" select='1'/>
-                       <field name="user_id" select="1" widget="selection">
-                       </field>                       
+						</field>
+						<field name="name" select="1"/>
+						<field name="user_id" select="1" widget="selection"/>
                    </group>
                </search>
             </field>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index b2ef7611c67..78c81d77e88 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -107,11 +107,29 @@
                 </tree>
             </field>
         </record>
+        <record id="view_res_partner_member_filter" model="ir.ui.view">
+		    <field name="name">res.partner.select</field>
+		    <field name="model">res.partner</field>
+		    <field name="type">search</field>
+		    <field name="arch" type="xml">
+		        <field name="category_id" position="after">
+		        	<field name="membership_state" select="1">
+			        	<filter icon="terp-partner" domain="[('membership_state', '=', 'paid')]" help="Paid Members"/>
+			        	<filter icon="terp-partner" domain="[('membership_state', '=', 'free')]" help="Free Members"/>
+			        	<filter icon="terp-partner" domain="[('associate_member', '!=', False), ('membership_state', '!=', 'none')]" help="Associated Members"/>
+			        	<filter icon="terp-partner" domain="[('membership_state', '=', 'invoiced')]" help="Invoiced Members"/>
+			        	<filter icon="terp-partner" domain="[('membership_state', '=', 'waiting')]" help="Future Members"/>
+			        	<filter icon="terp-partner" domain="[('membership_state', '=', 'old')]" help="Old Members"/>
+					</field>
+		       </field>
+		    </field>
+	    </record>
 
         <record model="ir.actions.act_window" id="action_membership_members">
             <field name="name">Current members</field>
             <field name="res_model">res.partner</field>
             <field name="domain">[('membership_state','&lt;&gt;','none'),('membership_state','&lt;&gt;','canceled'),('membership_state','&lt;&gt;','old'),('membership_state','&lt;&gt;','waiting')]</field>
+        	<field name="search_view_id" ref="view_res_partner_member_filter"/>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_membership_members_view_tree">
@@ -126,7 +144,7 @@
             <field name="view_mode">form</field>
             <field name="act_window_id" ref="action_membership_members"/>
         </record>
-
+        
         <menuitem name="Current members" parent="menu_membership"
             id="menu_members"
             sequence="2"
diff --git a/addons/report_analytic_planning/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml
index 4cb534faf84..f9a0b4a0017 100644
--- a/addons/report_analytic_planning/report_analytic_planning_view.xml
+++ b/addons/report_analytic_planning/report_analytic_planning_view.xml
@@ -163,7 +163,8 @@
 				<search string="Planning by Account">
 					<group col="8" colspan="4">
 						<filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Plannings"/>
-			        	<separator orientation="vertical"/>
+			        	<filter icon="terp-project" string="Current Plannings" domain="[('date_from','&lt;=',time.strftime('%%Y-%%m-%%d')),('date_to','&gt;=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/>
+						<separator orientation="vertical"/>
 						<field name="name" select="1"/>
 						<field name="code" select="1"/>
 						<field name="user_id" select="1"/>
@@ -297,10 +298,9 @@
 			<field name="view_mode">graph,tree</field>
 			<field name="search_view_id" ref="account_analytic_planning_stat_view_search"/>
 		</record>
-		<menuitem id="next_id_85" name="Planning"
-			parent="hr.menu_hr_reporting" />
+		
 		<menuitem action="action_account_analytic_planning_stat_form"
-			id="menu_report_account_analytic_planning_stat" parent="next_id_85" />
+			id="menu_report_account_analytic_planning_stat" parent="report_task.next_id_57" />
 
 <!--		Analytic account Form -->
 
diff --git a/addons/report_task/report_task.py b/addons/report_task/report_task.py
index 35ff87fdeee..aa39769e61f 100644
--- a/addons/report_task/report_task.py
+++ b/addons/report_task/report_task.py
@@ -128,10 +128,12 @@ class report_timesheet_task_user(osv.osv):
         return result
         
     _columns = {
-        'name': fields.date('Month',readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'user_id': fields.many2one('res.users', 'User',readonly=True),
         'timesheet_hrs': fields.function(get_hrs_timesheet, method=True, string="Timesheet Hours"),
         'task_hrs': fields.function(_get_task_hours, method=True, string="Task Hours"),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
+                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
       }
     
     
diff --git a/addons/report_task/report_task_view.xml b/addons/report_task/report_task_view.xml
index d503b585eff..c0704b031c8 100644
--- a/addons/report_task/report_task_view.xml
+++ b/addons/report_task/report_task_view.xml
@@ -48,6 +48,25 @@
             </field>
         </record>
         
+        <record id="view_task_project_search" model="ir.ui.view">
+            <field name="name">report.project.task.search</field>
+            <field name="model">report.project.task</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+            	<search string="Tasks by User">
+            		<group col="8" colspan="4">
+	            		<filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
+	            		<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
+	            		<separator orientation="vertical"/>
+	            		<field name="name" select="1"/>
+	                    <field name="month" select="1"/>
+	                    <field name="user_id" select="1"/>
+	                    <field name="project_id" select="1"/>
+            		</group>
+            	</search>
+            </field>
+        </record>
+        
         <record id="action_project_task" model="ir.actions.act_window">
             <field name="name">Tasks by User</field>
             <field name="res_model">report.task.user.pipeline.open</field>
diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml
index 100419607e2..9fc99e7b64e 100644
--- a/addons/report_timesheet/report_timesheet_view.xml
+++ b/addons/report_timesheet/report_timesheet_view.xml
@@ -63,7 +63,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
-                	<group col="8" colspan="4">
+                	<group col="10" colspan="4">
+                		<filter icon="terp-hr" string="My" domain="[('user_id','=',uid)]" help="My Timesheets"/>
+						<separator orientation="vertical"/>
 	                	<filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
 		            	<filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
 						<separator orientation="vertical"/>
@@ -111,6 +113,21 @@
             </field>
         </record>
         
+        <record id="view_timesheet_invoice_search" model="ir.ui.view">
+            <field name="name">report_timesheet.timesheet.invoice.search</field>
+            <field name="model">report_timesheet.invoice</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Timesheet by invoice">
+                	<filter icon="terp-hr" string="My" domain="[('user_id','=',uid)]" help="My Timesheets to invoice"/>
+					<separator orientation="vertical"/>
+                    <field name="account_id" select="1"/>
+                    <field name="manager_id" select="1"/>
+                    <field name="user_id" select="1"/>
+                </search>
+            </field>
+        </record>
+        
         <record id="view_timesheet_invoice_tree" model="ir.ui.view">
             <field name="name">report_timesheet.timesheet.invoice.tree</field>
             <field name="model">report_timesheet.invoice</field>
@@ -131,6 +148,7 @@
             <field name="res_model">report_timesheet.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
+            <field name="search_view_id" ref="view_timesheet_invoice_search"/>
         </record>
         <menuitem action="action_timesheet_invoice_stat_all" id="menu_report_timesheet_invoice_all" parent="hr.menu_hr_reporting"/>
         
@@ -183,7 +201,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
-                	<group col="8" colspan="4">
+                	<group col="10" colspan="4">
+                		<filter icon="terp-hr" string="My" domain="[('user_id','=',uid)]" help="My Daily Timesheets by account"/>
+						<separator orientation="vertical"/>
 	                	<filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
 		            	<filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
 	                    <separator orientation="vertical"/>
@@ -254,7 +274,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <form string="Timesheet by account">
-                	<group col="8" colspan="4">
+                	<group col="10" colspan="4">
+                		<filter icon="terp-hr" string="My" domain="[('user_id','=',uid)]" help="My Timesheets by account"/>
+						<separator orientation="vertical"/>
 	                	<filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
 		            	<filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
 	                    <separator orientation="vertical"/>
diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml
index a8b2abb351d..637e13feb7b 100644
--- a/addons/sale_journal/picking_journal_view.xml
+++ b/addons/sale_journal/picking_journal_view.xml
@@ -49,6 +49,25 @@
 			</tree>
 		</field>
 	</record>
+	
+	<record model="ir.ui.view" id="view_picking_journal_search">
+		<field name="name">sale_journal.picking.journal.search</field>
+		<field name="model">sale_journal.picking.journal</field>
+		<field name="type">search</field>
+		<field name="arch" type="xml">
+			<search string="Picking Journal">
+				<group col="8" colspan="4">
+					<filter icon="terp-hr" string="My" domain="[('user_id','=',uid)]" help="My Picking Journals"/>
+					<filter icon="terp-hr" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
+					<separator orientation="vertical"/>
+					<field name="name" select="1"/>
+					<field name="code" select="1"/>
+					<field name="user_id" select="1" widget="selection"/>
+					<field name="date" select="1"/>
+				</group>
+			</search>
+		</field>
+	</record>
 	<record model="ir.actions.act_window" id="action_definition_picking_journal">
 		<field name="name">Picking journals</field>
 		<field name="res_model">sale_journal.picking.journal</field>
@@ -56,7 +75,6 @@
 		<field name="view_mode">tree,form</field>
 	</record>
 
-
 	<menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
 
 	<record model="ir.actions.act_window" id="action_definition_picking_journal_tree">
@@ -65,6 +83,7 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[]</field>
+		<field name="search_view_id" ref="view_picking_journal_search"/>
 	</record>
 
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a85ba9320e7..43b30323520 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -711,8 +711,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Stock Delivery">
-                    <group col='8' colspan='4'>
+                    <group col="10" colspan="4">
                         <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Orders"/>
+                        <filter icon="terp-stock" string="Future Orders" domain="[('state','=','confirmed')]" help="Future Orders"/>
                         <filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
                         <separator orientation="vertical"/>
                         <field name="address_id" select="1"/>
@@ -751,7 +752,18 @@
             <field name="act_window_id" ref="action_picking_tree_delivery"/>
         </record>
 
+       <record id="action_picking_calendar_delivery" model="ir.actions.act_window">
+            <field name="name">Calendar of Deliveries</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">calendar,tree,form</field>
+            <field name="domain">[('state','=','assigned'),('type','=','delivery')]</field>
+            <field name="context">{'contact_display': 'partner'}</field>
+        </record>
+		
         <menuitem action="action_picking_tree_delivery" groups="base.group_extended" id="menu_action_picking_tree_delivery" parent="menu_stock_root" sequence="20"/>
+        <menuitem action="action_picking_calendar_delivery" id="menu_action_picking_calendar_delivery" parent="menu_action_picking_tree_delivery"/>
 
         #
         # Sending Products
@@ -851,7 +863,25 @@
                 </form>
             </field>
         </record>
-
+		
+		<record id="view_picking_out_search" model="ir.ui.view">
+            <field name="name">stock.picking.out.search</field>
+            <field name="model">stock.picking</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Picking list">
+                	<group col="8" colspan="4">
+                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Orders"/>
+                        <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Orders"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="address_id" select="1"/>
+                        <field name="company_id" select="1"/>
+                   </group>
+                </search>
+            </field>
+        </record>
+	
         <record id="action_picking_tree" model="ir.actions.act_window">
             <field name="name">Outgoing Products</field>
             <field name="res_model">stock.picking</field>
@@ -860,7 +890,7 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','out')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>
+            <field name="search_view_id" ref="view_picking_out_search"/>
         </record>
         <record id="action_picking_tree_out_view1_waiting" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -981,6 +1011,25 @@
                 </form>
             </field>
         </record>
+		
+		<record id="view_picking_in_search" model="ir.ui.view">
+            <field name="name">stock.picking.in.search</field>
+            <field name="model">stock.picking</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Input Picking List">
+                	<group col="8" colspan="4">
+                        <filter icon="terp-stock" string="To Process" domain="[('state','=','assigned')]" help="Assigned Incoming Orders"/>
+                        <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Incoming Orders"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="address_id" select="1"/>
+                        <field name="company_id" select="1"/>
+                   </group>
+                </search>
+            </field>
+        </record>
+
 
         <record id="action_picking_tree4" model="ir.actions.act_window">
             <field name="name">Incoming Products</field>
@@ -990,7 +1039,7 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','in')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>
+            <field name="search_view_id" ref="view_picking_in_search"/>
         </record>
         <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -1011,6 +1060,24 @@
         </record>
         <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_root" sequence="17"/>
 
+		<record id="view_picking_internal_search" model="ir.ui.view">
+            <field name="name">stock.picking.internal.search</field>
+            <field name="model">stock.picking</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Internal Picking List">
+                	<group col="8" colspan="4">
+                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
+                        <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="address_id" select="1"/>
+                        <field name="company_id" select="1"/>
+                   </group>
+                </search>
+            </field>
+        </record>
+
         <record id="action_picking_tree6" model="ir.actions.act_window">
             <field name="name">Internal Moves</field>
             <field name="res_model">stock.picking</field>
@@ -1019,7 +1086,7 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','internal')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>
+            <field name="search_view_id" ref="view_picking_internal_search"/>
         </record>
         <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_root" sequence="18"/>