From 58858da1a10802c9f0c4f32ed719fd319e66536a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 7 Jul 2010 18:48:15 +0530
Subject: [PATCH] [IMP]: crm: Improvement in lead and opportunity reports

bzr revid: rpa@tinyerp.com-20100707131815-8s3qwdxhd6f0mv3t
---
 addons/crm/report/crm_lead_report.py       |    2 +-
 addons/crm/report/crm_lead_report_view.xml |   17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index f7cd5ba..0993cf2 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -146,7 +146,7 @@ class crm_lead_report(osv.osv):
                     0 as avg_answers,
                     0.0 as perc_done,
                     0.0 as perc_cancel,
-                    (SELECT count(id) FROM mailgate_message WHERE model='crm.lead' AND res_id=c.id) AS email,
+                    (SELECT count(id) FROM mailgate_message WHERE model='crm.lead' AND res_id=c.id AND history=True) AS email,
                     date_trunc('day',c.create_date) as create_date,
                     extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
                     extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as  delay_expected,
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index be76711..e180d59 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -56,15 +56,6 @@
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <group col="20" colspan="8">
-                        <filter icon="terp-check"
-                            string="Opportunities"
-                            name="opportunity"
-                            domain="[('type','=','opportunity')]"/>
-                        <filter icon="terp-check"
-                            string="Leads"
-                            name="lead"
-                            domain="[('type','=','lead')]"/>
-                        <separator orientation="vertical" />
                         <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"
@@ -74,7 +65,7 @@
                         <separator orientation="vertical" />
                         <filter icon="terp-check"
                             string="Current"
-                            domain="[('state','in',('draft','open')]"/>
+                            domain="[('state','in',('draft','open'))]"/>
                         <filter icon="terp-check"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
@@ -149,7 +140,7 @@
             <field name="model">crm.lead.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            <tree string="Leads Analysis">
+            <tree string="Opportunities Analysis">
                 <field name="name" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="section_id" invisible="1" groups="base.group_extended"/>
@@ -181,7 +172,7 @@
             <field name="view_type">form</field>
             <field name="context">{'search_default_lead':1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">tree,graph</field>
-            <field name="domain">[]</field>
+            <field name="domain">[('type', '=', 'lead')]</field>
         </record>
 
        <record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
@@ -204,7 +195,7 @@
             <field name="view_type">form</field>
             <field name="context">{"search_default_opportunity": 1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">tree,graph</field>
-            <field name="domain">[]</field>
+            <field name="domain">[('type', '=', 'opportunity')]</field>
         </record>
 
        <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_tree">
-- 
1.7.10.4