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_fund_view.xml b/addons/crm/crm_fund_view.xml
index 250f7473592..f7a45b1f082 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -37,7 +37,7 @@
         <field name="arch" type="xml">
             <tree string="Funds Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id"/>
-                <field name="name" string="Funds"/>
+                <field name="name" string="Fund Description"/>
                 <field name="categ_id"/>
                 <field name="type_id" string="Payment Mode"/>
                 <field name="planned_cost" string="Amount"/>
@@ -197,7 +197,7 @@
                            <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Funds"/>
                            <filter icon="gtk-media-pause" domain="[('state','=','pending')]" help="Pending Funds"/>
                        </field>
-                       <field name="name" select='1'/>
+                       <field name="name" select='1' string="Fund Description"/>
                        <field name="user_id" select="1" widget="selection"/>
 					   <field name="section_id" select="1" widget="selection" string="Section" default="context.get('section_id', False)">
 							<filter icon="terp-crm"
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 8faba79a093..da92023ee55 100644
--- a/addons/report_crm/report_crm_fundraising_view.xml
+++ b/addons/report_crm/report_crm_fundraising_view.xml
@@ -14,11 +14,11 @@
 	              	<field name="name" />
 					<field name="month"/>
                 	<field name="nbr" string="#Fundraising"/>
-                	<field name="delay_close"/>
                     <field name="amount_revenue"/>
-                    <field name="amount_revenue_prob"/>
                     <field name="probability"/>
-                    <field name="state"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="delay_close"/>
+                    <field name="state" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="stage_id"  invisible="1"/>
                     <field name="categ_id" invisible="1"/>
@@ -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 c7bb87f3dc4..27f9ceda835 100644
--- a/addons/report_crm/report_crm_phonecall_view.xml
+++ b/addons/report_crm/report_crm_phonecall_view.xml
@@ -15,7 +15,10 @@
 					<field name="month"/>
 					<field name="nbr" string="#Phone calls" />
 	                <field name="delay_close"/>
-	                <field name="categ_id" invisible="1"/>
+                    <field name="state" invisible="1"/>
+                    <field name="section_id" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="categ_id" invisible="1"/>	                
 				</tree>
             </field>
         </record>
@@ -45,41 +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="My Cases" icon="terp-hr" domain="[('user_id','=',uid)]" help="My cases by section"/>
-                   		<separator orientation="vertical"/>
-                   		<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="Won" icon="terp-hr" domain="[('state','=','done')]"/>
-						<filter string="Lost" icon="terp-hr" domain="[('state','=','cancel')]"/>						
-						<separator orientation="vertical"/>
-						<field name="name" select="1"/>
-	                    <field name="month" select="1"/>
-	                    <field name="user_id" select="1"/>
-						<field name="section_id" select="1"/>
-	                    <field name="nbr" select="1"/>
-	                    <field name="state" select="1"/>
-                   </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="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 6e93f65fb43..c55cf54e9c1 100644
--- a/addons/report_crm/report_crm_view.xml
+++ b/addons/report_crm/report_crm_view.xml
@@ -53,20 +53,26 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="8">
-                   		<filter string="My Cases" icon="terp-hr" domain="[('user_id','=',uid)]" help="My cases by section"/>
-                   		<separator orientation="vertical"/>
                    		<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')]"/>						
-						<separator orientation="vertical"/>
-						<field name="name" select="1"/>
-	                    <field name="month" select="1"/>
-	                    <field name="user_id" select="1"/>
-						<field name="section_id" select="1"/>
-	                    <field name="nbr" select="1"/>
-	                    <field name="state" select="1"/>
+						<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">
@@ -75,6 +81,7 @@
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
                     	<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>
                    
diff --git a/addons/sale/report_sale_view.xml b/addons/sale/report_sale_view.xml
index 28749e8b672..286a529cf82 100644
--- a/addons/sale/report_sale_view.xml
+++ b/addons/sale/report_sale_view.xml
@@ -85,13 +85,5 @@
 	        <field name="act_window_id" ref="action_order_report_tree_all"/>
 	    </record>      
 
-	<menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
-	
-	<menuitem id="sale_reporting_menu" name="Sale" parent="base.next_id_64" sequence="8"/>
-	
-    <menuitem action="action_sale_order_report_all" id="menu_report_sale_order_all" parent="sale.sale_reporting_menu" sequence="3"/>
-    
-    <menuitem action="action_order_report_tree_all" id="menu_report_order_product_all1" parent="sale.sale_reporting_menu" sequence="4"/>
-     
       </data>
-    </openerp>    
\ No newline at end of file
+  </openerp>    
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>
 
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index e92e2103740..9706103127f 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -78,7 +78,7 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page string="Tasks">
-                            <field colspan="4" name="tasks_id" nolabel="1" widget="one2many_list"/>
+                            <field colspan="4" name="tasks_id" nolabel="1" widget="one2many_list" context="{'default_project_id':project_id, 'default_sprint_id':sprint_id, 'default_product_backlog_id':active_id}"/>
                         </page>
                     </notebook>
                     <group col="7" colspan="4">
@@ -184,17 +184,17 @@
                     <notebook colspan="4">
                         <page string="Sprint Info">
                             <group colspan="2" col="2">
-                                <separator string="Owners"/>
+                                <separator string="Owners" colspan="2"/>
                                 <field name="product_owner_id"/>
                                 <field name="scrum_master_id"/>
                             </group>
                             <group colspan="2" col="2">
-                                <separator string="Dates"/>
+                                <separator string="Dates" colspan="2"/>
                                 <field name="date_start" select="1"/>
                                 <field name="date_stop"/>
                             </group>
                             <group colspan="2" col="2">
-                                <separator string="Planning"/>
+                                <separator string="Planning" colspan="2"/>
                                 <field name="planned_hours" widget="float_time"/>
                                 <field name="expected_hours" widget="float_time"/>
                                 <field name="effective_hours" widget="float_time"/>
diff --git a/addons/scrum/wizard/backlog_to_task.py b/addons/scrum/wizard/backlog_to_task.py
index 295ec6c1d5f..65795906765 100644
--- a/addons/scrum/wizard/backlog_to_task.py
+++ b/addons/scrum/wizard/backlog_to_task.py
@@ -48,7 +48,7 @@ def _do_create(self, cr, uid, data, context):
             'name': backlog.name,
             'description': backlog.note,
             'project_id': backlog.project_id.id,
-            'user_id': (backlog.user_id and backlog.user_id.id) or uid,
+            'user_id': data['form']['user_id'] or (backlog.user_id and backlog.user_id.id) or uid,
             'planned_hours': backlog.planned_hours
         }))