diff --git a/addons/report_crm/report_crm_opportunity.py b/addons/report_crm/report_crm_opportunity.py index 1adfbf4baed..8ff49af0e71 100644 --- a/addons/report_crm/report_crm_opportunity.py +++ b/addons/report_crm/report_crm_opportunity.py @@ -12,7 +12,8 @@ class report_crm_opportunity(osv.osv): 'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True), '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.opportunity')]"), - 'stage_id':fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]", readonly=True), + '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'), } def init(self, cr): tools.drop_view_if_exists(cr, 'report_crm_opportunity') @@ -27,6 +28,7 @@ class report_crm_opportunity(osv.osv): c.section_id, c.categ_id, c.stage_id, + c.partner_id, count(*) as nbr, 0 as avg_answers, 0.0 as perc_done, @@ -37,7 +39,7 @@ class report_crm_opportunity(osv.osv): to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close from crm_opportunity 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_opportunity() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_crm/report_crm_opportunity_view.xml b/addons/report_crm/report_crm_opportunity_view.xml index f093d07940d..bd5e14edae6 100644 --- a/addons/report_crm/report_crm_opportunity_view.xml +++ b/addons/report_crm/report_crm_opportunity_view.xml @@ -13,14 +13,15 @@ + + - + + - - @@ -63,6 +64,8 @@ + + diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml index b69ee89548b..8b88c7ef524 100644 --- a/addons/report_crm/report_crm_view.xml +++ b/addons/report_crm/report_crm_view.xml @@ -53,8 +53,8 @@ - - + + @@ -67,24 +67,19 @@ domain="[('section_id.user_id','=',uid)]" help="My section"/> - - - + - + + + + - - -