[IMP]:Improved dashboard for crm.Commented nonused report field in cmm reports.

bzr revid: apa@tinyerp.com-20100318092945-ovhboctc9q7huofu

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"

addons/board_crm_configuration/board_crm_view.xml

@@ -7,7 +7,7 @@
 
 		<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">
@@ -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"/>

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
@@ -11,6 +19,8 @@ class crm_lead_report(osv.osv):
         '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),
+        '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,

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,

addons/crm/report/crm_report.py

@@ -69,9 +69,9 @@ class crm_case_report(osv.osv):
         '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),