[IMP] crm:-useability improvements in Leads Analysis and Opportunities Analysis

bzr revid: mtr@mtr-20100921134736-6udg87kazch8rcu7

1 files changed, 25 insertions, 22 deletions

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index e6b2f6af4f1..1e52b7a4f6b 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -9,7 +9,7 @@
             <field name="model">crm.lead.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            <tree colors="blue:state in ('draft');black:state in ('open','pending','done');gray:state in ('cancel') " string="Leads Analysis">
+            <tree string="Leads Analysis">
                 <field name="name" invisible="1"/>
                 <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
@@ -21,12 +21,12 @@
                 <field name="user_id" invisible="1"/>
                 <field name="company_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
+                <field name="country_id" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="nbr" sum="# Leads"/>
                 <field name="email" sum="# Mails"/>
                 <field name="delay_open"/>
                 <field name="delay_close"/>
-                <field name="delay_expected"/>
                 <field name="avg_answers"/>
              </tree>
             </field>
@@ -69,31 +69,35 @@
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <group col="20" colspan="8">
-                        <filter string="Last 365 Days" icon="terp-go-year"
-                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter string="Last 30 Days" icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-week" string="7 Days" separator="1"
-                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
+                        <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"/>
+                        <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"
+                            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"/>
+                            
                         <separator orientation="vertical" />
                         <filter icon="terp-check"
                             string="Current"
                             domain="[('state','in',('draft','open'))]"/>
-                        <filter icon="terp-check"
+                        <filter icon="gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-                        <filter icon="terp-check"
+                        <filter icon="terp-dialog-close"
                             string="Closed"
                             domain="[('state','=','done')]"/>
+                            
                         <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" />
+                                help="My team" />
                         </field>
                         <field name="user_id">
                             <filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
@@ -101,20 +105,19 @@
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By...">
-                        <filter string="User" name="user" icon="terp-personal"
+                        <filter string="Salesman" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+"
+                            domain="[]"
+                            context="{'group_by':'section_id'}" />
                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
                        <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Section" icon="terp-personal+"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
-                        <filter string="Category" icon="terp-stock_symbol-selection"
-                            domain="[]" context="{'group_by':'categ_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+                        <filter string="Category" icon="terp-stock_symbol-selection"
+                            domain="[]" context="{'group_by':'categ_id'}" />
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
@@ -124,11 +127,11 @@
                             context="{'group_by':'company_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}"/>
+                            domain="[]" context="{'group_by':'day'}" help="Day on which lead/opportunity is created"/>
                         <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" />
+                            domain="[]" context="{'group_by':'month'}" help="Month in which lead/opportunity is created"/>
                         <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" />
+                            domain="[]" context="{'group_by':'name'}" help="Year in which lead/opportunity is created"/>
                   </group>
                   <newline/>
                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">