From 4cf84946522d9683d95cc5c9f0558caa446002e9 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 23 Sep 2010 19:02:48 +0530
Subject: [PATCH] [IMP] crm and crm*:-useability improvements in Reporting

bzr revid: mtr@mtr-20100923133248-vfmxlozaii77fa4l
---
 addons/crm/report/crm_lead_report_view.xml    | 10 +++++-----
 .../crm/report/crm_phonecall_report_view.xml  | 17 +++++++++-------
 .../report/crm_claim_report_view.xml          | 14 ++++++-------
 .../report/crm_fundraising_report_view.xml    | 20 +++++++++----------
 .../report/crm_helpdesk_report_view.xml       | 16 +++++++--------
 5 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 0a36ab4e01c..b91f7be89d0 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -73,13 +73,13 @@
                     <group col="20" colspan="8">
                         <filter string="  Year  " icon="terp-go-year"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Leads/Opportunities created in last 365 days"/>
+                            help="Leads/Opportunities created in current year"/>
                         <filter string="   Month   " icon="terp-go-month" name="this_month"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                            help="Leads/Opportunities created in last 30 days"/>
-                        <filter icon="terp-go-week" string="    Month-1    " separator="1"
+                            help="Leads/Opportunities created in current month"/>
+                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Leads/Opportunities created in the previous month"/>
+                            help="Leads/Opportunities created in last month"/>
                             
                         <separator orientation="vertical" />
                         <filter icon="terp-check"
@@ -101,7 +101,7 @@
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My team" />
                         </field>
-                        <field name="user_id">
+                        <field name="user_id" string="Salesman">
                             <filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                         </field>
                    </group>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index f717cc0ca6d..20ad0668fc6 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -76,13 +76,16 @@
                 <search string="Search">
                   <group col="16" colspan="8">
                            <filter string="  Year  " icon="terp-go-year"
-                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"/>
+                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
+                               help="Phone calls made in current year"/>
 
                        <filter string="   Month   " icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"/>
+                           domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                           help="Phone calls made in current month"/>
 
-                       <filter icon="terp-go-week" string="    Month-1    " separator="1"
-                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"/>
+                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            help="Phone calls made in last month"/>
 
                            <separator orientation="vertical" />
                         <filter icon="terp-check"
@@ -95,15 +98,15 @@
                             string="Done"
                             domain="[('state','=','done')]"/>
                       <separator orientation="vertical" />
-                        <field name="section_id"
+                        <field name="section_id" string="Sales Team"
                             default="context.get('section_id', False)"
                             context="{'invisible_section': False}">               
                        <filter icon="terp-personal+"
                            context="{'invisible_section': False}"
                            domain="[('section_id.user_id','=',uid)]"
-                           help="My section" />
+                           help="My team" />
                         </field>   
-                          <field name="user_id" select="1">
+                          <field name="user_id" string="Salesman" select="1">
                             <filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                            </field>
                    </group>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index c003105ee8a..cabf4ae1f0f 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -79,15 +79,15 @@
                   <group col="16" colspan="8">
                    		<filter string="  Year  " icon="terp-go-year"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                   			help="Claims created in last 365 days"/>
+                   			help="Claims created in current year"/>
 
                        <filter string="   Month   " icon="terp-go-month" name="This Month"
                     	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                    	   help="Claims created in last 30 days"/>
+                    	   help="Claims created in current month"/>
 
-                       <filter icon="terp-go-week" string="    Month-1    " separator="1"
+                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Claims created in the previous month"/>
+                            help="Claims created in last month"/>
 
                    		<separator orientation="vertical" />
                         <filter icon="terp-document-new"
@@ -101,14 +101,14 @@
                     		domain="[('state','=','pending')]"/>
 
                    		<separator orientation="vertical" />
-                   		<field name="section_id"
+                   		<field name="section_id" string="Sales Team"
                    			default="context.get('section_id', False)"
                    			context="{'invisible_section': False}">
 
                    			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
-                   				help="My section" />
+                   				help="My team" />
 
                    		</field>
                    		<field name="company_id">
@@ -118,7 +118,7 @@
                         help="My company"/>
                         </field>
 
-                      	<field name="user_id" select="1">
+                      	<field name="user_id" string="Salesman" select="1">
 	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 15f06706bed..fb82f4cbc24 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -78,15 +78,15 @@
                   <group col="16" colspan="8">
                    		<filter string="  Year  " icon="terp-go-year"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                   			help="Funds raised in last 365 days"/>
+                   			help="Funds raised in current year"/>
 
                        <filter string="   Month   " icon="terp-go-month" name="This Month"
                     	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                    	   help="Funds raised in last 30 days"/>
+                    	   help="Funds raised in current month"/>
 
-                       <filter icon="terp-go-week" string="    Month-1    " separator="1"
+                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Funds raised in the previous month"/>
+                            help="Funds raised in last month"/>
 
                    		<separator orientation="vertical" />
                         <filter icon="terp-document-new"
@@ -100,14 +100,14 @@
                     		domain="[('state','=','pending')]"/>
 
                    		<separator orientation="vertical" />
-                   		<field name="section_id"
+                   		<field name="section_id" string="Sales Team"
                    			default="context.get('section_id', False)"
                    			context="{'invisible_section': False}">
 
                    			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
-                   				help="My section" />
+                   				help="My team" />
 
                    		</field>
                    		<field name="company_id">
@@ -117,7 +117,7 @@
                         help="My company"/>
                         </field>
 
-                      	<field name="user_id" select="1">
+                      	<field name="user_id" select="1" string="Salesman">
 	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
@@ -146,15 +146,15 @@
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}"
-                            help="Day on which fund is raised"/>
+                            help="Date of fundraising"/>
 
                         <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" 
-                            help="Month in which fund is raised"/>
+                            help="Month of fundraising"/>
 
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" 
-                            help="Year in which fund is raised"/>
+                            help="Year of fundraising"/>
 
                   </group>
                    <newline/>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index bfe6552299e..836aa1d2020 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -78,13 +78,13 @@
                   <group col="16" colspan="9">
                			<filter string="  Year  " icon="terp-go-year"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Helpdesk requests created in last 365 days"/>
+                            help="Helpdesk requests occurred in current year"/>
                         <filter string="   Month   " icon="terp-go-month" name="this_month"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                            help="Helpdesk requests created in last 30 days"/>
-                        <filter icon="terp-go-week" string="    Month-1    " separator="1"
+                            help="Helpdesk requests occurred in current month"/>
+                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Helpdesk requests created in the previous month"/>
+                            help="Helpdesk requests occurred in last month"/>
 
                    		<separator orientation="vertical" />
                    		<filter string="Current" icon="terp-check"
@@ -97,14 +97,14 @@
                    			domain="[('state','=','cancel')]" />
 
                    		<separator orientation="vertical" />
-                   		<field name="section_id"
+                   		<field name="section_id" string="Sales Team"
                    			default="context.get('section_id', False)"
                    			context="{'invisible_section': False}">
 
                    			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
-                   				help="My section" />
+                   				help="My team" />
 
                    		</field>
                    		<field name="company_id">
@@ -113,7 +113,7 @@
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
                         </field>
-                         <field name="user_id">
+                         <field name="user_id" string="Salesman">
                          <filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                          </field>
                    </group>
@@ -145,7 +145,7 @@
                             
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}" help="Day of helpdesk requests"/>
+                            domain="[]" context="{'group_by':'day'}" help="Date of helpdesk requests"/>
                         <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" help="Month of helpdesk requests"/>
                         <filter string="Year" icon="terp-go-year"