From 1d02bbc21b4cc52c03178cf2bdc0dc428ea74cc4 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Thu, 4 Mar 2010 12:43:09 +0530 Subject: [PATCH] [Fix] report_crm: Fix the problem report_crm_fundraising report bzr revid: sbh@tinyerp.com-20100304071309-x8bbl2zqwfzagt1y --- addons/crm/crm_fundraising.py | 1 + addons/report_crm/report_crm_fundraising.py | 4 +--- addons/report_crm/report_crm_fundraising_view.xml | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/crm/crm_fundraising.py b/addons/crm/crm_fundraising.py index c5ed7b19d67..df30ac8385f 100644 --- a/addons/crm/crm_fundraising.py +++ b/addons/crm/crm_fundraising.py @@ -53,6 +53,7 @@ class crm_fundraising(osv.osv): _defaults = { 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], + 'probability':lambda *a:0.0, } crm_fundraising() diff --git a/addons/report_crm/report_crm_fundraising.py b/addons/report_crm/report_crm_fundraising.py index 1adb47651e4..397a50896bc 100644 --- a/addons/report_crm/report_crm_fundraising.py +++ b/addons/report_crm/report_crm_fundraising.py @@ -7,7 +7,6 @@ class report_crm_fundraising(osv.osv): _inherit = "report.crm.case" _columns = { 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.fundraising')]"), - 'stage_id':fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.fundraising')]", readonly=True), 'probability': fields.float('Avg. Probability', readonly=True), 'amount_revenue': fields.float('Est.Revenue', readonly=True), 'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True), @@ -25,7 +24,6 @@ class report_crm_fundraising(osv.osv): c.user_id, c.section_id, c.categ_id, - c.stage_id, count(*) as nbr, 0 as avg_answers, 0.0 as perc_done, @@ -36,7 +34,7 @@ class report_crm_fundraising(osv.osv): to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close from crm_fundraising c - group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.categ_id,c.stage_id + group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.categ_id )""") report_crm_fundraising() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_crm/report_crm_fundraising_view.xml b/addons/report_crm/report_crm_fundraising_view.xml index db63d023d0b..1bdba2fb4a4 100644 --- a/addons/report_crm/report_crm_fundraising_view.xml +++ b/addons/report_crm/report_crm_fundraising_view.xml @@ -21,7 +21,6 @@ -