diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index b82f57b88ca..e0fd5d90c80 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -36,6 +36,8 @@
                 <field name="id"/>
                 <field name="name"/>
                 <field name="partner_id"/>
+                <field name="user_id" />
+                <field name="section_id" string="Section" />
                 <field name="date" string="Claim Date"/>
                  <field name="date_deadline" string="Deadline"/>
                  <field name="date_closed" string="Closure Date"/>
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 06d072d6760..68a47fef9f8 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -129,6 +129,7 @@
                 <field name="date" string="Date"/>
                 <field name="date_deadline"/>
                 <field name="user_id"/>
+                <field name="section_id" string="Section" />
                 <field name="state"/>
                 <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-close"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
@@ -172,12 +173,10 @@
                     />
                 <separator orientation="vertical"/>
                 <field name="name" select='1' string="Query"/>
+                <field name="partner_id" />
                 <field name="user_id" select="1" widget="selection">
                     <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Helpdesk Requests" default="1"/>
                 </field>
-                <field name="state" select="1">
-                    <filter icon="gtk-index" domain="[('state','in',('open','draft' ))]" help="Current " default="1"/>
-                </field>
                 <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
                     <filter icon="terp-crm"
                         domain="[('section_id','=',context.get('section_id',False))]"
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index f6905947797..2b3438978a3 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -79,7 +79,7 @@
                 <group col="3" colspan="2">
                     <separator colspan="3" string="Contacts" />
                     <field name="partner_id" />
-                    <button string="Convert to Partner"
+                    <button string="Create a Partner"
                         icon="terp-crm"
                         name="%(wizard_crm_phonecall_partner_create)d"
                         type="action"
diff --git a/addons/crm/wizard/crm_lead_wizard.py b/addons/crm/wizard/crm_lead_wizard.py
index cfb63acbc38..70c71e023c2 100644
--- a/addons/crm/wizard/crm_lead_wizard.py
+++ b/addons/crm/wizard/crm_lead_wizard.py
@@ -30,7 +30,7 @@ from tools.translate import _
 class partner_create(wizard.interface):
 
     case_form = """<?xml version="1.0"?>
-    <form string="Convert To Partner">
+    <form string="Create a Partner">
         <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
         <label string="You may have to verify that this partner does not exist already." colspan="4"/>
         <!--field name="close"/-->
@@ -41,7 +41,7 @@ class partner_create(wizard.interface):
     }
 
     partner_form = """<?xml version="1.0"?>
-    <form string="Convert To Partner">
+    <form string="Create a Partner">
         <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
         <label string="You may have to verify that this partner does not exist already." colspan="4"/>
         <newline />
diff --git a/addons/crm/wizard/crm_phonecall_wizard.py b/addons/crm/wizard/crm_phonecall_wizard.py
index 550417561d7..007ae372975 100644
--- a/addons/crm/wizard/crm_phonecall_wizard.py
+++ b/addons/crm/wizard/crm_phonecall_wizard.py
@@ -30,7 +30,7 @@ from tools.translate import _
 class partner_create(wizard.interface):
 
     case_form = """<?xml version="1.0"?>
-    <form string="Convert To Partner">
+    <form string="Create a Partner">
         <label string="Are you sure you want to create a partner based on this phonecall ?" colspan="4"/>
         <label string="You may have to verify that this partner does not exist already." colspan="4"/>
         <!--field name="close"/-->
@@ -41,7 +41,7 @@ class partner_create(wizard.interface):
     }
 
     partner_form = """<?xml version="1.0"?>
-    <form string="Convert To Partner">
+    <form string="Create a Partner">
         <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
         <label string="You may have to verify that this partner does not exist already." colspan="4"/>
         <newline />
diff --git a/addons/report_crm/report_crm_claim_view.xml b/addons/report_crm/report_crm_claim_view.xml
index 396b2131b5d..67933557a1c 100644
--- a/addons/report_crm/report_crm_claim_view.xml
+++ b/addons/report_crm/report_crm_claim_view.xml
@@ -56,7 +56,7 @@
             <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <field name="state" position="before">
+                <field name="user_id" position="before">
                </field>
             </field>
         </record>
diff --git a/addons/report_crm/report_crm_fundraising_view.xml b/addons/report_crm/report_crm_fundraising_view.xml
index 531d1f857f6..da92023ee55 100644
--- a/addons/report_crm/report_crm_fundraising_view.xml
+++ b/addons/report_crm/report_crm_fundraising_view.xml
@@ -61,7 +61,7 @@
             <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <field name="state" position="before">
+                <field name="user_id" position="before">
                </field>
             </field>
         </record>
diff --git a/addons/report_crm/report_crm_lead_view.xml b/addons/report_crm/report_crm_lead_view.xml
index a8ae77672f4..97903e738f7 100644
--- a/addons/report_crm/report_crm_lead_view.xml
+++ b/addons/report_crm/report_crm_lead_view.xml
@@ -55,7 +55,7 @@
             <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                  <field name="state" position="before"/>
+                  <field name="user_id" position="before"/>
             </field>
         </record>
        	
diff --git a/addons/report_crm/report_crm_opportunity_view.xml b/addons/report_crm/report_crm_opportunity_view.xml
index 4efbba6ef00..9b2712ef57b 100644
--- a/addons/report_crm/report_crm_opportunity_view.xml
+++ b/addons/report_crm/report_crm_opportunity_view.xml
@@ -61,7 +61,7 @@
             <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <field name="state" position="before">
+                <field name="user_id" position="before">
                </field>
             </field>
         </record>
diff --git a/addons/report_crm/report_crm_phonecall_view.xml b/addons/report_crm/report_crm_phonecall_view.xml
index 0dba4834158..27f9ceda835 100644
--- a/addons/report_crm/report_crm_phonecall_view.xml
+++ b/addons/report_crm/report_crm_phonecall_view.xml
@@ -48,48 +48,18 @@
                     <field group="True" name="user_id"/>
                 </graph>
             </field>
-        </record>
+        </record> 
 
         <record id="view_crm_phonecall_filter" model="ir.ui.view">
             <field name="name">report.crm.phonecall.select</field>
             <field name="model">report.crm.phonecall</field>
+            <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-				<search string="Search">
-                  <group col="16" colspan="8">
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]"/>
-						<filter string="Current" icon="terp-hr" domain="[('state','=','draft')]"/>
-						<filter string="Won" icon="terp-hr" domain="[('state','=','done')]"/>
-						<filter string="Lost" icon="terp-hr" domain="[('state','=','cancel')]"/>
-						<separator orientation="vertical"/>	
-						<field name="section_id" default="context.get('section_id', False)" widget="selection"
-                    				context="{'invisible_section': False}">
-                   		 <filter icon="terp-crm"
-                        context="{'invisible_section': False}"
-                        domain="[('section_id.user_id','=',uid)]"
-                        help="My section"/>
-                        </field>
-                         <field name="user_id" widget="selection">
-                    	<filter icon="terp-partner"
-                        	domain="[('user_id','=',uid)]"
-                        	help="My " default="1"
-                    	/>
-                </field>						
-                   </group>
-                   <newline/>
-                  <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Section" icon="terp-sale" domain="[]" context="{'group_by':'section_id'}"/>
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                    	<filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
-                    	<filter string="Year" icon="terp-sale" domain="[]" context="{'group_by':'name'}"/>
-                    	<filter string="Category" icon="terp-sale" domain="[]" context="{'group_by':'categ_id'}"/>
-                   </group>
-               </search>
-            
+                <field name="user_id" position="before">
+               </field>
             </field>
-        </record>
+        </record>       
         
         <record id="action_report_crm_phonecall" model="ir.actions.act_window">
             <field name="name">Phone Calls</field>
diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml
index f2498a0fe11..c55cf54e9c1 100644
--- a/addons/report_crm/report_crm_view.xml
+++ b/addons/report_crm/report_crm_view.xml
@@ -55,6 +55,7 @@
                   <group col="16" colspan="8">
                    		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
 						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]"/>
+                        <separator orientation="vertical"/>	
 						<filter string="Current" icon="terp-hr" domain="[('state','=','draft')]"/>
 						<filter string="Won" icon="terp-hr" domain="[('state','=','done')]"/>
 						<filter string="Lost" icon="terp-hr" domain="[('state','=','cancel')]"/>
@@ -71,9 +72,7 @@
                         	domain="[('user_id','=',uid)]"
                         	help="My " default="1"
                     	/>
-                </field>						
-						<separator orientation="vertical"/>
-				        <field name="state" select="1"/>
+                </field>
                    </group>
                    <newline/>
                   <group expand="1" string="Group By..." colspan="4" col="8">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 563739c53ae..e48d59d1f4a 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -408,6 +408,25 @@
             </field>
         </record>
 
+        <record id="view_sales_order_uninvoiced_line_filter" model="ir.ui.view">
+            <field name="name">sale.order.uninvoiced.line</field>
+            <field name="model">sale.order.line</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Uninvoiced Lines">
+                    <field name="order_id" select="1"/>
+                    <field name="product_id" select="1"/>
+                    <newline />
+                    <group expand="1" string="Group By..." colspan="9" col="8">
+                        <filter string="Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
+                        <!--
+                        <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'order_partner_id'}"/>
+                        -->
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <record id="action_order_line_tree2" model="ir.actions.act_window">
             <field name="name">Uninvoiced Lines</field>
             <field name="type">ir.actions.act_window</field>
@@ -415,6 +434,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="domain">[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
+            <field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter" />
             <field name="filter" eval="True"/>
         </record>