From 643a441448de4cd94c731286f5a33286b77395d9 Mon Sep 17 00:00:00 2001 From: "Harry (Open ERP)" Date: Tue, 23 Feb 2010 17:12:49 +0530 Subject: [PATCH] [FIX] report_crm: crash after removing fields on opportunity, phonecall bzr revid: hmo@tinyerp.com-20100223114249-gzc52yc4yygt2e3j --- addons/crm_hr/crm_hr.py | 3 +-- addons/report_crm/report_crm.py | 5 ++--- addons/report_crm/report_crm_opportunity.py | 14 +++++-------- addons/report_crm/report_crm_phonecall.py | 22 +++++---------------- 4 files changed, 13 insertions(+), 31 deletions(-) diff --git a/addons/crm_hr/crm_hr.py b/addons/crm_hr/crm_hr.py index f7668a42f3c..bf4ffe9d65c 100644 --- a/addons/crm_hr/crm_hr.py +++ b/addons/crm_hr/crm_hr.py @@ -41,8 +41,7 @@ class crm_applicant(osv.osv): 'partner_mobile': fields.char('Mobile', size=32), 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.applicant')]"), 'type_id': fields.many2one('crm.case.resource.type', 'Type Name', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.applicant')]"), - 'duration': fields.float('Duration'), - 'case_id': fields.many2one('crm.case', 'Related Case'), + 'duration': fields.float('Duration'), 'ref' : fields.reference('Reference', selection=crm._links_get, size=128), 'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128), 'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \ diff --git a/addons/report_crm/report_crm.py b/addons/report_crm/report_crm.py index f49d0fe7b28..8de833c2553 100644 --- a/addons/report_crm/report_crm.py +++ b/addons/report_crm/report_crm.py @@ -127,8 +127,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 = { - 'date': fields.datetime('Date', readonly=True), + _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), @@ -140,7 +139,7 @@ class report_crm_case_service_dashboard(osv.osv): def init(self, cr): cr.execute("""create or replace view report_crm_case_service_dashboard as ( select - cse.id as id, cse.date as date, cse.date_deadline as date_deadline, + 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.create_date as create_date diff --git a/addons/report_crm/report_crm_opportunity.py b/addons/report_crm/report_crm_opportunity.py index 796ae488442..6671d72fd8b 100644 --- a/addons/report_crm/report_crm_opportunity.py +++ b/addons/report_crm/report_crm_opportunity.py @@ -8,8 +8,7 @@ class report_crm_opportunity_user(osv.osv): _inherit = "report.crm.case.user" _columns = { 'probability': fields.float('Avg. Probability', readonly=True), - 'amount_revenue': fields.float('Est.Revenue', readonly=True), - 'amount_costs': fields.float('Est.Cost', readonly=True), + 'amount_revenue': fields.float('Est.Revenue', readonly=True), 'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True), 'delay_close': fields.char('Delay to close', size=20, readonly=True), } @@ -25,8 +24,7 @@ class report_crm_opportunity_user(osv.osv): c.user_id, c.section_id, count(*) as nbr, - sum(planned_revenue) as amount_revenue, - sum(planned_cost) as amount_costs, + sum(planned_revenue) as amount_revenue, sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob, avg(probability)::decimal(16,2) as probability, to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close @@ -43,8 +41,7 @@ class report_crm_opportunity_categ(osv.osv): _inherit = "report.crm.case.categ" _columns = { 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"), - 'amount_revenue': fields.float('Est.Revenue', readonly=True), - 'amount_costs': fields.float('Est.Cost', readonly=True), + 'amount_revenue': fields.float('Est.Revenue', readonly=True), 'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True), 'probability': fields.float('Avg. Probability', readonly=True), 'delay_close': fields.char('Delay Close', size=20, readonly=True), @@ -62,8 +59,7 @@ class report_crm_opportunity_categ(osv.osv): c.state, c.section_id, count(*) as nbr, - sum(planned_revenue) as amount_revenue, - sum(planned_cost) as amount_costs, + sum(planned_revenue) as amount_revenue, sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob, avg(probability)::decimal(16,2) as probability, to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close @@ -233,4 +229,4 @@ class report_crm_opportunity_section_categ_type(osv.osv): group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),c.user_id, c.categ_id, c.type_id, c.state, c.stage_id, c.section_id)""") report_crm_opportunity_section_categ_type() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_crm/report_crm_phonecall.py b/addons/report_crm/report_crm_phonecall.py index a9aad6241e7..5af580ba18c 100644 --- a/addons/report_crm/report_crm_phonecall.py +++ b/addons/report_crm/report_crm_phonecall.py @@ -6,10 +6,7 @@ class report_crm_phonecall_user(osv.osv): _description = "Phone calls by user and section" _auto = False _inherit = "report.crm.case.user" - _columns = { - '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), + _columns = { 'delay_close': fields.char('Delay to close', size=20, readonly=True), } def init(self, cr): @@ -23,10 +20,7 @@ class report_crm_phonecall_user(osv.osv): c.state, c.user_id, c.section_id, - count(*) as nbr, - sum(planned_revenue) as amount_revenue, - sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob, - avg(probability)::decimal(16,2) as probability, + count(*) as nbr, to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close from crm_phonecall c @@ -40,10 +34,7 @@ class report_crm_phonecall_categ(osv.osv): _auto = False _inherit = "report.crm.case.categ" _columns = { - 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.phonecall')]"), - 'amount_revenue': fields.float('Est.Revenue', readonly=True), - 'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True), - 'probability': fields.float('Avg. Probability', readonly=True), + 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.phonecall')]"), 'delay_close': fields.char('Delay Close', size=20, readonly=True), } @@ -58,10 +49,7 @@ class report_crm_phonecall_categ(osv.osv): c.categ_id, c.state, c.section_id, - count(*) as nbr, - sum(planned_revenue) as amount_revenue, - sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob, - avg(probability)::decimal(16,2) as probability, + count(*) as nbr, to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close from crm_phonecall c @@ -124,4 +112,4 @@ class report_crm_phonecall_section(osv.osv): )""") report_crm_phonecall_section() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: