From e3166d455d636765426db5861bd938930d66ce46 Mon Sep 17 00:00:00 2001
From: "apa,rch" <>
Date: Thu, 18 Mar 2010 14:59:45 +0530
Subject: [PATCH] [IMP]:Improved dashboard for crm.Commented nonused report
 field in cmm reports.

bzr revid: apa@tinyerp.com-20100318092945-ovhboctc9q7huofu
---
 .../board_crm_statistical_view.xml            | 12 ++++-----
 .../board_crm_view.xml                        | 12 ++++-----
 addons/crm/report/crm_lead_report.py          | 14 ++++++++--
 addons/crm/report/crm_opportunity_report.py   | 12 ++++++++-
 addons/crm/report/crm_report.py               | 26 +++++++++----------
 5 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/addons/board_crm_configuration/board_crm_statistical_view.xml b/addons/board_crm_configuration/board_crm_statistical_view.xml
index 8dbe05735f0..3a320b64e0d 100644
--- a/addons/board_crm_configuration/board_crm_statistical_view.xml
+++ b/addons/board_crm_configuration/board_crm_statistical_view.xml
@@ -6,40 +6,38 @@
          -->
         <record model="ir.ui.view" id="view_crm_lead_stage_graph1">
             <field name="name">Leads By Stage - Graph</field>
-            <field name="model">report.crm.lead.section.stage</field>
+            <field name="model">crm.lead.report</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Leads By Stage" type="pie">
                     <field name="stage_id"/>
                     <field name="nbr" operator="+"/>
-                    <field name="state" group="True"/>
                 </graph>
             </field>
         </record>
 
         <record model="ir.ui.view" id="view_crm_opportunity_categ_graph">
             <field name="name">report.crm.opportunity.categ.graph</field>
-            <field name="model">report.crm.opportunity.categ</field>
+            <field name="model">crm.opportunity.report</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Opportunity by Sections and Categories" type="bar" orientation="horizontal">
                     <field name="categ_id"/>
                     <field name="nbr" operator="+"/>
-                    <field name="state" group="True"/>
                 </graph>
             </field>
         </record>
 
         <act_window name="Opportunities By Categories"
             domain="[('state','!=','done'),('state','!=','cancel')]"
-            res_model="report.crm.opportunity.categ"
+            res_model="crm.opportunity.report"
             view_type="form"
             view_mode="graph,tree,form"
             view_id="view_crm_opportunity_categ_graph"
             id="act_oppor_categ"/>
 
         <record model="ir.actions.act_window" id="act_leads_state">
-            <field name="res_model">report.crm.lead.section.stage</field>
+            <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_lead_stage_graph1"/>
@@ -48,7 +46,7 @@
 
         <act_window name="Leads Of The Month By User"
             domain="[('month','=',time.strftime('%%m')),('state','!=','cancel')]"
-            res_model="report.crm.lead.user"
+            res_model="crm.lead.report"
             view_type="form"
             view_mode="graph,tree,form"
             view_id="view_crm_lead_stage_graph1"
diff --git a/addons/board_crm_configuration/board_crm_view.xml b/addons/board_crm_configuration/board_crm_view.xml
index 586a3c64baa..db13d00196a 100644
--- a/addons/board_crm_configuration/board_crm_view.xml
+++ b/addons/board_crm_configuration/board_crm_view.xml
@@ -4,10 +4,10 @@
 		<record model="board.note.type" id="note_crm_type">
 			<field name="name">CRM Configuration</field>
 		</record>
-		
+
 		<record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
 			<field name="name">crm.opportunity.user.graph1</field>
-			<field name="model">report.crm.opportunity.user</field>
+			<field name="model">crm.opportunity.report</field>
 			<field name="type">graph</field>
 			<field name="arch" type="xml">
 				<graph string="Opportunities by User and Section" type="pie">
@@ -32,7 +32,7 @@
 			<field name="view_id" ref="crm.crm_case_tree_view_meet"/>
 			<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
 		</record>
-		
+
 		<act_window name="My Cases"
 				domain="[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]"
 				res_model="crm.case"
@@ -41,7 +41,7 @@
 				id="act_my_cases"/>
 
 		<record model="ir.actions.act_window" id="act_my_leads_stage">
-			<field name="res_model">report.crm.lead.section.stage</field>
+			<field name="res_model">crm.lead.report</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree,form</field>
 			<field name="view_id" ref="view_crm_lead_stage_graph1"/>
@@ -49,7 +49,7 @@
 		</record>
 
 		<record model="ir.actions.act_window" id="act_sales_pipeline">
-			<field name="res_model">report.crm.opportunity.user</field>
+			<field name="res_model">crm.opportunity.report</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree,form</field>
 			<field name="view_id" ref="view_crm_opportunity_user_graph1"/>
@@ -78,7 +78,7 @@
 								name="%(act_my_meetings)d"
 								height="150"
 								colspan="4"/>
-	
+
 							<action
 								string="My Cases"
 								name="%(act_my_cases)d"
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index b0911553981..1b7ad8c3c05 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -1,6 +1,14 @@
 from osv import fields,osv
 import tools
 
+AVAILABLE_STATES = [
+    ('draft','Draft'),
+    ('open','Open'),
+    ('cancel', 'Cancelled'),
+    ('done', 'Closed'),
+    ('pending','Pending')
+]
+
 class crm_lead_report(osv.osv):
     _name = "crm.lead.report"
     _auto = False
@@ -10,7 +18,9 @@ class crm_lead_report(osv.osv):
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]" ,readonly=True),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]", readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner' ,readonly=True),
-        'company_id': fields.many2one('res.company','Company',readonly=True),  
+        'company_id': fields.many2one('res.company','Company',readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'user_id': fields.many2one('res.user', 'Company',readonly=True),
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'crm_lead_report')
@@ -20,7 +30,7 @@ class crm_lead_report(osv.osv):
                     min(c.id) as id,
                     to_char(c.create_date, 'YYYY') as name,
                     to_char(c.create_date, 'MM') as month,
-                    c.state,
+                    c.state as state,
                     c.user_id,
                     c.stage_id,
                     c.company_id,
diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py
index c9e9e69e815..02f71e845ba 100644
--- a/addons/crm/report/crm_opportunity_report.py
+++ b/addons/crm/report/crm_opportunity_report.py
@@ -1,6 +1,14 @@
 from osv import fields,osv
 import tools
 
+AVAILABLE_STATES = [
+    ('draft','Draft'),
+    ('open','Open'),
+    ('cancel', 'Cancelled'),
+    ('done', 'Closed'),
+    ('pending','Pending')
+]
+
 class crm_opportunity_report(osv.osv):
     _name = "crm.opportunity.report"
     _auto = False
@@ -15,6 +23,8 @@ class crm_opportunity_report(osv.osv):
         'stage_id':fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]", readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
         'company_id': fields.many2one('res.company', 'Company',readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'user_id': fields.many2one('res.user', 'Company',readonly=True),
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'crm_opportunity_report')
@@ -24,7 +34,7 @@ class crm_opportunity_report(osv.osv):
                     min(c.id) as id,
                     to_char(c.create_date, 'YYYY') as name,
                     to_char(c.create_date, 'MM') as month,
-                    c.state,
+                    c.state as state,
                     c.user_id,
                     c.section_id,
                     c.categ_id,
diff --git a/addons/crm/report/crm_report.py b/addons/crm/report/crm_report.py
index 2781768abf8..275fd8a01d9 100644
--- a/addons/crm/report/crm_report.py
+++ b/addons/crm/report/crm_report.py
@@ -39,14 +39,14 @@ class crm_case_report(osv.osv):
         res = {}
         state_perc = 0.0
         avg_ans = 0.0
-        
+
         for case in self.browse(cr, uid, ids, context):
             if field_name != 'avg_answers':
                 state = field_name[5:]
                 cr.execute("select count(*) from crm_opportunity where section_id =%s and state='%s'"%(case.section_id.id,state))
                 state_cases = cr.fetchone()[0]
                 perc_state = (state_cases / float(case.nbr) ) * 100
-                
+
                 res[case.id] = perc_state
             else:
                 model_name = self._name.split('report.')
@@ -57,24 +57,24 @@ class crm_case_report(osv.osv):
 
                     cr.execute("select count(*) from crm_case_log l, ir_model m  where l.model_id=m.id and m.model = '%s'" , model_name)
                     logs = cr.fetchone()[0]
-                    
+
                     avg_ans = logs / case.nbr
-                    res[case.id] = avg_ans       
-        
+                    res[case.id] = avg_ans
+
         return res
 
     _columns = {
         'name': fields.char('Year',size=64,required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
-        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),        
+        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
         'nbr': fields.integer('# of Cases', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
-        'avg_answers': fields.function(_get_data,string='Avg. Answers', method=True,type="integer"),
-        'perc_done': fields.function(_get_data,string='%Done', method=True,type="float"),
-        'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"),
+#        'avg_answers': fields.function(_get_data,string='Avg. Answers', method=True,type="integer"),
+#        'perc_done': fields.function(_get_data,string='%Done', method=True,type="float"),
+#        'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                                   ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
-        'company_id': fields.many2one('res.company','Company',readonly=True),                                  
+        'company_id': fields.many2one('res.company','Company',readonly=True),
     }
     _order = 'name desc, user_id'
     def init(self, cr):
@@ -100,7 +100,7 @@ class report_crm_case_service_dashboard(osv.osv):
     _name = "report.crm.case.service.dashboard"
     _description = "Report of Closed and Open CRM Cases within past 15 days"
     _auto = False
-    _columns = {        
+    _columns = {
         'date_deadline': fields.datetime('Deadline', readonly=True),
         'name': fields.char('Description', size=64, readonly=True),
         'user_id': fields.many2one('res.users', 'Responsible', readonly=True),
@@ -108,13 +108,13 @@ class report_crm_case_service_dashboard(osv.osv):
         'create_date' : fields.datetime('Create Date', readonly=True)
     }
     _order = 'create_date'
-    
+
     def init(self, cr):
         cr.execute("""create or replace view report_crm_case_service_dashboard as (
             select
                 cse.id as id, cse.date_deadline as date_deadline,
                 cse.name as name, cse.user_id as user_id,
-                 cse.state as state,
+                cse.state as state,
                 cse.create_date as create_date
             from
                 crm_case cse