diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 37577dd5844..31611ede82d 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -142,28 +142,6 @@
         </record>
         <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="purchase.menu_purchase_root"/>
 
-        <record id="purchase_form_action2" model="ir.actions.act_window">
-            <field name="name">Request For Quotations</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.order</field>
-            <field name="domain">[('state','=','draft')]</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_purchase_order_filter"/>            
-        </record>
-
-        <record id="purchase_form_action3" model="ir.actions.act_window">
-            <field name="name">Purchase Order Waiting Approval</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','=','confirmed')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_purchase_order_filter"/>            
-        </record>
-
         <record id="purchase_form_action4" model="ir.actions.act_window">
             <field name="name">Purchase Orders in Progress</field>
             <field name="type">ir.actions.act_window</field>
@@ -171,28 +149,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','approved')]</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_purchase_order_filter"/>            
         </record>
 
-        <record id="purchase_form_action_new" model="ir.actions.act_window">
-            <field name="name">New Purchase Order</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.order</field>
-            <field name="view_mode">form,tree</field>
-        </record>
-
-        <record id="purchase_form_action3" model="ir.actions.act_window">
-            <field name="name">Purchase Order Waiting Approval</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','=','confirmed')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_purchase_order_filter"/>
-        </record>
-
         <record id="purchase_order_tree" model="ir.ui.view">
             <field name="name">purchase.order.tree</field>
             <field name="model">purchase.order</field>
diff --git a/addons/report_account/report_receivable_view.xml b/addons/report_account/report_receivable_view.xml
index 7ef469c96fe..9d02b716739 100644
--- a/addons/report_account/report_receivable_view.xml
+++ b/addons/report_account/report_receivable_view.xml
@@ -115,8 +115,8 @@
 		    <field name="view_id" ref="board_view_created_invoice"/>
 	    </record>
 	    
-	    <menuitem id="menu_report_this_month" name="This Month" parent="account.menu_finance_reporting"/>
-	    <menuitem id="menu_report_all_months" name="All Months" parent="account.menu_finance_reporting"/>
+<!--	    <menuitem id="menu_report_this_month" name="This Month" parent="account.menu_finance_reporting"/>-->
+	    <menuitem id="menu_report_all_months" name="Sales by Account" parent="account.menu_finance_reporting"/>
 	    <!-- Report of the sales by product and account -->
 	    <record id="view_report_account_sales_tree" model="ir.ui.view">
             <field name="name">report.account.sales.tree</field>
@@ -146,26 +146,30 @@
                  </graph>
              </field>
         </record>
-
-        <record id="action_report_account_sales_tree" model="ir.actions.act_window">
-            <field name="name">Sales by Account (this month)</field>
-            <field name="res_model">report.account.sales</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
-        </record>
         
-        <menuitem action="action_report_account_sales_tree" id="menu_report_account_sales" parent="menu_report_this_month"/>
+        <record id="view_report_account_sales_search" model="ir.ui.view">
+            <field name="name">report.account.sales.search</field>
+            <field name="model">report.account.sales</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Sales by Account">
+					<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
+					<filter icon="terp-sale" string="This Month" domain="[('name','=',time.strftime('%%Y-%%m-01'))]" help="This Months Sales by type"/>
+					<separator orientation="vertical"/>
+					<field name="name" select="1"/>
+					<field name="month" select="1"/>
+               </search>
+            </field>
+        </record>
         
         <record id="action_report_account_sales_tree_all" model="ir.actions.act_window">
             <field name="name">Sales by Account</field>
             <field name="res_model">report.account.sales</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
+            <field name="search_view_id" ref="view_report_account_sales_search"/>
         </record>        
         <menuitem action="action_report_account_sales_tree_all" id="menu_report_account_sales_all" parent="menu_report_all_months"/>
-
-        
         
         <!-- Report of the sales by product and account type -->
 	    <record id="view_report_account_type_sales_tree" model="ir.ui.view">
@@ -211,21 +215,27 @@
              </field>
         </record>
 
-        <record id="action_report_account_type_sales_tree" model="ir.actions.act_window">
-            <field name="name">Sales by Account Type (this month)</field>
-            <field name="res_model">report.account_type.sales</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
+		<record id="view_report_account_type_sales_search" model="ir.ui.view">
+            <field name="name">report.account_type.sales.search</field>
+            <field name="model">report.account_type.sales</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Sales by Account">
+					<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
+					<filter icon="terp-sale" string="This Month" domain="[('name','=',time.strftime('%%Y-%%m-01'))]" help="This Months Sales by type"/>
+					<separator orientation="vertical"/>
+					<field name="name" select="1"/>
+					<field name="month" select="1"/>
+               </search>
+            </field>
         </record>
-        
-        <menuitem action="action_report_account_type_sales_tree" id="menu_report_account_type_sales" parent="menu_report_this_month"/>
-        
+
         <record id="action_report_account_type_sales_tree_all" model="ir.actions.act_window">
             <field name="name">Sales by Account Type</field>
             <field name="res_model">report.account_type.sales</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
+            <field name="search_view_id" ref="view_report_account_type_sales_search"/>
         </record>        
         <menuitem action="action_report_account_type_sales_tree_all" id="menu_report_account_type_sales_all" parent="menu_report_all_months"/>
 
diff --git a/addons/report_document/report_document_view.xml b/addons/report_document/report_document_view.xml
index 7226e953aa9..8f654c96983 100644
--- a/addons/report_document/report_document_view.xml
+++ b/addons/report_document/report_document_view.xml
@@ -34,49 +34,46 @@
             </field>
         </record>
 
+		<record id="view_report_document_user_search" model="ir.ui.view">
+            <field name="name">report.document.user.search</field>
+            <field name="model">report.document.user</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="All users files">
+                	<group col="8" colspan="4">
+						<filter icon="terp-stock" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Files"/>
+						<filter icon="terp-stock" string="This Month" domain="[('name','=',time.strftime('%%Y-%%m-01'))]" help="This Months Files"/>
+						<separator orientation="vertical"/>
+						<field name="name" select="1"/>
+						<field name="file_title" select="1"/>
+	                    <field name="user" select="1"/>
+	                    <field name="directory" select="1"/>
+	           		</group>
+               </search>
+            </field>
+        </record>
 
         <record model="ir.actions.act_window" id="action_view_my_document_tree">
-            <field name="name">My files (This months)</field>
+            <field name="name">My files</field>
             <field name="res_model">report.document.user</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
-            <field name="domain">[('user_id','=',uid),('name','=',time.strftime('%Y-%m-01'))]</field>
+            <field name="search_view_id" ref="view_report_document_user_search"/>
         </record>
         
         <menuitem name="Document Management" id="menu_action_view_my_document"/>
         <menuitem name="Reporting" id="menu_action_view_my_document_report" parent="menu_action_view_my_document"/>
-        <menuitem name="This Month" id="menu_action_view_my_document_report_this" parent="menu_action_view_my_document_report"/>
-        <menuitem name="My files" id="menu_action_view_my_document_report_this_myfile" parent="menu_action_view_my_document_report_this" action="action_view_my_document_tree"/>
-
-        <record model="ir.actions.act_window" id="action_view_my_document_tree1">
-            <field name="name">My files (All months)</field>
-            <field name="res_model">report.document.user</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="domain">[('user_id','=',uid)]</field>
-        </record>
-        
-        <menuitem name="All Months" id="menu_action_view_my_document_report_all" parent="menu_action_view_my_document_report"/>
-        <menuitem name="My files" id="menu_action_view_my_document_report_all_myfile" parent="menu_action_view_my_document_report_all" action="action_view_my_document_tree1"/>
-
-        <record model="ir.actions.act_window" id="action_view_all_document_tree">
-            <field name="name">All Users files (This month)</field>
-            <field name="res_model">report.document.user</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
-        </record>
-        
-        <menuitem name="All Users files" id="menu_action_view_my_document_report_this_userfile" parent="menu_action_view_my_document_report_this" action="action_view_all_document_tree"/>
+        <menuitem name="My files" id="menu_action_view_my_document_report_this_myfile" parent="menu_action_view_my_document_report" action="action_view_my_document_tree"/>
 
         <record model="ir.actions.act_window" id="action_view_all_document_tree1">
-            <field name="name">All Users files (All months)</field>
+            <field name="name">All Users files</field>
             <field name="res_model">report.document.user</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
+            <field name="search_view_id" ref="view_report_document_user_search"/>
         </record>
         
-        <menuitem name="All Users files" id="menu_action_view_my_document_report_all_userfile" parent="menu_action_view_my_document_report_all" action="action_view_all_document_tree1"/>
+        <menuitem name="All Users files" id="menu_action_view_my_document_report_all_userfile" parent="menu_action_view_my_document_report" action="action_view_all_document_tree1"/>
         
 <!--        -->
         <record model="ir.ui.view" id="view_document_wall_form">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c6d62c93931..6bbe4bce2dd 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -585,6 +585,26 @@
                 </form>
             </field>
         </record>
+        
+        
+        <record id="view_stock_picking_filter" model="ir.ui.view">
+            <field name="name">stock.picking.list.select</field>
+            <field name="model">stock.picking</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Stock Picking">
+                    <group col="8" colspan="4">
+                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
+                        <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/>
+                        <separator orientation="vertical"/>
+                        <field name="location_id" select="1"/>
+                        <field name="location_dest_id" select="1"/>
+                        <field name="name" select="1"/>
+                        <field name="address_id" select="1"/>
+                   </group>
+              </search>
+            </field>
+        </record>
 
         #
         # Delivery Orders
@@ -728,74 +748,6 @@
 
         <menuitem action="action_picking_tree_delivery" groups="base.group_extended" id="menu_action_picking_tree_delivery" parent="menu_stock_root" sequence="20"/>
 
-        <record id="action_picking_tree2_delivery" model="ir.actions.act_window">
-            <field name="name">Delivery Orders to Process</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">tree,form,calendar</field>
-            <field name="domain">[('state','=','assigned'),('type','=','delivery')]</field>
-            <field name="context">{'contact_display': 'partner'}</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>
-        </record>
-        <record id="action_picking_tree_delivery_view1_toproc" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_picking_delivery_tree"/>
-            <field name="act_window_id" ref="action_picking_tree2_delivery"/>
-        </record>
-        <record id="action_picking_tree_delivery_view2_toproc" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_picking_delivery_form"/>
-            <field name="act_window_id" ref="action_picking_tree2_delivery"/>
-        </record>
-        <record id="action_picking_tree_delivery_view2_toproc_cal" model="ir.actions.act_window.view">
-            <field eval="3" name="sequence"/>
-            <field name="view_mode">calendar</field>
-            <field name="act_window_id" ref="action_picking_tree2_delivery"/>
-        </record>
-
-        <record id="action_picking_tree3_delivery" model="ir.actions.act_window">
-            <field name="name">Future Delivery Orders</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">tree,form,calendar</field>
-            <field name="domain">[('state','=','confirmed'),('type','=','delivery')]</field>
-            <field name="context">{'contact_display': 'partner'}</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>
-        </record>
-        <record id="action_picking_tree_delivery_view1_waiting" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_picking_delivery_tree"/>
-            <field name="act_window_id" ref="action_picking_tree3_delivery"/>
-        </record>
-        <record id="action_picking_tree_delivery_view2_waiting" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_picking_delivery_form"/>
-            <field name="act_window_id" ref="action_picking_tree3_delivery"/>
-        </record>
-        <record id="action_picking_tree_delivery_view2_waiting_cal" model="ir.actions.act_window.view">
-            <field eval="3" name="sequence"/>
-            <field name="view_mode">calendar</field>
-            <field name="act_window_id" ref="action_picking_tree3_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>
-
         #
         # Sending Products
         #
@@ -902,7 +854,6 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','out')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <record id="action_picking_tree_out_view1_waiting" model="ir.actions.act_window.view">
@@ -924,64 +875,6 @@
         </record>
         <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_root" sequence="19"/>
 
-        <record id="action_picking_tree2" model="ir.actions.act_window">
-            <field name="name">Available Picking</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">tree,form,calendar</field>
-            <field name="domain">[('state','=','assigned'),('type','=','out')]</field>
-            <field name="context">{'contact_display': 'partner'}</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>
-        </record>
-        <record id="action_picking_tree2_out_view1" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_picking_out_tree"/>
-            <field name="act_window_id" ref="action_picking_tree2"/>
-        </record>
-        <record id="action_picking_tree2_out_view2" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_picking_out_form"/>
-            <field name="act_window_id" ref="action_picking_tree2"/>
-        </record>
-        <record id="action_picking_tree2_out_view2_cal" model="ir.actions.act_window.view">
-            <field eval="3" name="sequence"/>
-            <field name="view_mode">calendar</field>
-            <field name="act_window_id" ref="action_picking_tree2"/>
-        </record>
-
-        <record id="action_picking_tree3" model="ir.actions.act_window">
-            <field name="name">Confirmed Picking Waiting Availability</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">tree,form,calendar</field>
-            <field name="domain">[('state','=','confirmed'),('type','=','out')]</field>
-            <field name="context">{'contact_display': 'partner'}</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>
-        </record>
-        <record id="action_picking_tree3_out_view1" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_picking_out_tree"/>
-            <field name="act_window_id" ref="action_picking_tree3"/>
-        </record>
-        <record id="action_picking_tree3_out_view2" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_picking_out_form"/>
-            <field name="act_window_id" ref="action_picking_tree3"/>
-        </record>
-        <record id="action_picking_tree3_out_view2_cal" model="ir.actions.act_window.view">
-            <field eval="3" name="sequence"/>
-            <field name="view_mode">calendar</field>
-            <field name="act_window_id" ref="action_picking_tree3"/>
-        </record>
-
         #
         # Reception of Products
         #
@@ -1090,7 +983,6 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','in')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
@@ -1112,36 +1004,6 @@
         </record>
         <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_root" sequence="17"/>
 
-        <record id="action_picking_tree5" model="ir.actions.act_window">
-            <field name="name">Picking to Process</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">tree,form,calendar</field>
-            <field name="domain">[('state','=','assigned'),('type','=','in')]</field>
-            <field name="context">{'contact_display': 'partner'}</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>
-        </record>
-        <record id="action_invoice_tree6_view1" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_picking_in_tree"/>
-            <field name="act_window_id" ref="action_picking_tree5"/>
-        </record>
-        <record id="action_invoice_tree6_view2" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_picking_in_form"/>
-            <field name="act_window_id" ref="action_picking_tree5"/>
-        </record>
-        <record id="action_invoice_tree6_view2_cal" model="ir.actions.act_window.view">
-            <field eval="3" name="sequence"/>
-            <field name="view_mode">calendar</field>
-            <field name="act_window_id" ref="action_picking_tree5"/>
-        </record>
-        <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="menu_action_picking_tree4" groups="base.group_extended"/>
-
         <record id="action_picking_tree6" model="ir.actions.act_window">
             <field name="name">Internal Moves</field>
             <field name="res_model">stock.picking</field>
@@ -1150,36 +1012,10 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','internal')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_root" sequence="18"/>
 
-
-        <record id="action_picking_tree7" model="ir.actions.act_window">
-            <field name="name">Available Picking</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">tree,form,calendar</field>
-            <field name="domain">[('state','=','assigned'),('type','=','internal')]</field>
-            <field name="context">{'contact_display': 'partner'}</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>
-        </record>
-
-        <record id="action_picking_tree8" model="ir.actions.act_window">
-            <field name="name">Confirmed Picking Waiting Availability</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">tree,form,calendar</field>
-            <field name="domain">[('state','=','confirmed'),('type','=','internal')]</field>
-            <field name="context">{'contact_display': 'partner'}</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>
-        </record>
-
         =============================
         Move Tracking
         =============================
@@ -1253,41 +1089,43 @@
                 </form>
             </field>
         </record>
+        
+        <record id="view_move_search" model="ir.ui.view">
+            <field name="name">stock.move.search</field>
+            <field name="model">stock.move</field>
+            <field name="type">tree</field>
+            <field eval="6" name="priority"/>
+            <field name="arch" type="xml">
+            	<search string="Stock Moves">
+            		<group col="8" colspan="4">
+	            		<filter icon="terp-stock" string="Draft" domain="[('state','=','draft')]" help="Draft Moves"/>
+	            		<filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Available Moves"/>
+	            		<separator orientation="vertical"/>
+	            		<field name="location_id" select="1"/>
+	                    <field name="location_dest_id" select="1"/>
+	                    <field name="product_id" select="1"/>
+                    </group>
+            	</search>
+            </field>
+        </record>
+        
         <record id="action_move_form2" model="ir.actions.act_window">
             <field name="name">Stock Moves</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_move_tree"/>
+            <field name="search_view_id" ref="view_move_search"/>
         </record>
         <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability_low"/>
 
-        <record id="action_move_form3" model="ir.actions.act_window">
-            <field name="name">Draft Moves</field>
-            <field name="res_model">stock.move</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('state','=','draft')]</field>
-            <field name="view_id" ref="view_move_tree"/>
-            <field name="filter" eval="True"/>
-        </record>
-
-        <record id="action_move_form4" model="ir.actions.act_window">
-            <field name="name">Available Moves</field>
-            <field name="res_model">stock.move</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('state','=','assigned')]</field>
-            <field name="view_id" ref="view_move_tree"/>
-            <field name="filter" eval="True"/>
-        </record>
-
         <record id="action_picking_all" model="ir.actions.act_window">
             <field name="name">Picking</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">tree,form,calendar</field>
+            <field name="search_view_id" ref="view_stock_picking_filter"/>
             <field name="context">{'contact_display': 'partner'}</field>
         </record>
         <menuitem action="action_picking_all" id="menu_action_picking_all" parent="menu_traceability_low"/>