From c872a4a4460b1031d474d4bb80cf496d5bbe4be8 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Fri, 5 Mar 2010 13:49:49 +0530 Subject: [PATCH] [IMP] report_crm: Add the partner_id and section_id in all view bzr revid: sbh@tinyerp.com-20100305081949-pd9032ukqas9oa1h --- addons/report_crm/report_crm_claim.py | 6 ++++-- addons/report_crm/report_crm_claim_view.xml | 5 +++-- addons/report_crm/report_crm_fundraising.py | 4 +++- addons/report_crm/report_crm_fundraising_view.xml | 5 +++-- addons/report_crm/report_crm_lead.py | 4 +++- addons/report_crm/report_crm_lead_view.xml | 5 +++-- addons/report_crm/report_crm_opportunity_view.xml | 2 +- addons/report_crm/report_crm_phonecall.py | 4 +++- addons/report_crm/report_crm_phonecall_view.xml | 5 +++-- 9 files changed, 26 insertions(+), 14 deletions(-) diff --git a/addons/report_crm/report_crm_claim.py b/addons/report_crm/report_crm_claim.py index e78f2c8aa51..7f171849462 100644 --- a/addons/report_crm/report_crm_claim.py +++ b/addons/report_crm/report_crm_claim.py @@ -8,7 +8,8 @@ class report_crm_claim(osv.osv): _columns = { 'delay_close': fields.char('Delay to close', size=20, readonly=True), 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]", readonly=True), - 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"), + 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"), + 'partner_id': fields.many2one('res.partner', 'Partner'), } def init(self, cr): tools.drop_view_if_exists(cr, 'report_crm_claim') @@ -22,6 +23,7 @@ class report_crm_claim(osv.osv): c.user_id, c.stage_id, c.section_id, + c.partner_id, c.categ_id, count(*) as nbr, 0 as avg_answers, @@ -30,7 +32,7 @@ class report_crm_claim(osv.osv): to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close from crm_claim c - group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id, c.stage_id,c.categ_id + group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id, c.stage_id,c.categ_id,c.partner_id )""") report_crm_claim() diff --git a/addons/report_crm/report_crm_claim_view.xml b/addons/report_crm/report_crm_claim_view.xml index 1766eabb94f..9186ff49865 100644 --- a/addons/report_crm/report_crm_claim_view.xml +++ b/addons/report_crm/report_crm_claim_view.xml @@ -10,12 +10,13 @@ + + + - - diff --git a/addons/report_crm/report_crm_fundraising.py b/addons/report_crm/report_crm_fundraising.py index 397a50896bc..bd136e28162 100644 --- a/addons/report_crm/report_crm_fundraising.py +++ b/addons/report_crm/report_crm_fundraising.py @@ -11,6 +11,7 @@ class report_crm_fundraising(osv.osv): '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), + 'partner_id': fields.many2one('res.partner', 'Partner'), } def init(self, cr): tools.drop_view_if_exists(cr, 'report_crm_fundraising') @@ -24,6 +25,7 @@ class report_crm_fundraising(osv.osv): c.user_id, c.section_id, c.categ_id, + c.partner_id, count(*) as nbr, 0 as avg_answers, 0.0 as perc_done, @@ -34,7 +36,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 + 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.partner_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 dc188ef9956..509adf7e530 100644 --- a/addons/report_crm/report_crm_fundraising_view.xml +++ b/addons/report_crm/report_crm_fundraising_view.xml @@ -13,14 +13,15 @@ + + + - - diff --git a/addons/report_crm/report_crm_lead.py b/addons/report_crm/report_crm_lead.py index 2f170bd1825..0f42c0803ef 100644 --- a/addons/report_crm/report_crm_lead.py +++ b/addons/report_crm/report_crm_lead.py @@ -9,6 +9,7 @@ class report_crm_lead(osv.osv): 'delay_close': fields.char('Delay to close', size=20, readonly=True), 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"), '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'), } def init(self, cr): tools.drop_view_if_exists(cr, 'report_crm_lead') @@ -23,6 +24,7 @@ class report_crm_lead(osv.osv): c.stage_id, c.section_id, c.categ_id, + c.partner_id, count(*) as nbr, 0 as avg_answers, 0.0 as perc_done, @@ -30,7 +32,7 @@ class report_crm_lead(osv.osv): to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close from crm_lead c - group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.stage_id,categ_id + group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.stage_id,categ_id,c.partner_id )""") report_crm_lead() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_crm/report_crm_lead_view.xml b/addons/report_crm/report_crm_lead_view.xml index d5f4e63fd16..b5491dffd80 100644 --- a/addons/report_crm/report_crm_lead_view.xml +++ b/addons/report_crm/report_crm_lead_view.xml @@ -13,11 +13,12 @@ + + + - - diff --git a/addons/report_crm/report_crm_opportunity_view.xml b/addons/report_crm/report_crm_opportunity_view.xml index bd5e14edae6..3deb335ffd3 100644 --- a/addons/report_crm/report_crm_opportunity_view.xml +++ b/addons/report_crm/report_crm_opportunity_view.xml @@ -15,12 +15,12 @@ + - diff --git a/addons/report_crm/report_crm_phonecall.py b/addons/report_crm/report_crm_phonecall.py index e693179a258..129fd977356 100644 --- a/addons/report_crm/report_crm_phonecall.py +++ b/addons/report_crm/report_crm_phonecall.py @@ -9,6 +9,7 @@ class report_crm_phonecall(osv.osv): _columns = { 'delay_close': fields.char('Delay to close', size=20, readonly=True), 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.phonecall')]"), + } def init(self, cr): tools.drop_view_if_exists(cr, 'report_crm_phonecall') @@ -22,6 +23,7 @@ class report_crm_phonecall(osv.osv): c.user_id, c.section_id, c.categ_id, + c.partner_id, count(*) as nbr, 0 as avg_answers, 0.0 as perc_done, @@ -29,7 +31,7 @@ class report_crm_phonecall(osv.osv): to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close from crm_phonecall 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 + 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.partner_id )""") report_crm_phonecall() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_crm/report_crm_phonecall_view.xml b/addons/report_crm/report_crm_phonecall_view.xml index 672f6fe101d..8b6e87f54a5 100644 --- a/addons/report_crm/report_crm_phonecall_view.xml +++ b/addons/report_crm/report_crm_phonecall_view.xml @@ -13,11 +13,12 @@ + + + - -