diff --git a/addons/report_crm/report_crm.py b/addons/report_crm/report_crm.py index 552f56c2732..d5e490627b7 100644 --- a/addons/report_crm/report_crm.py +++ b/addons/report_crm/report_crm.py @@ -69,6 +69,7 @@ class report_crm_case_categ(osv.osv): _auto = False _columns = { 'name': fields.char('Year',size=64,required=False, readonly=True), + 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True), 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True), 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), @@ -84,10 +85,11 @@ class report_crm_case_categ(osv.osv): to_char(c.create_date, 'YYYY') as name, to_char(c.create_date, 'MM') as month, c.state, + c.section_id, count(*) as nbr from crm_case c - group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state + group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state,c.section_id )""") report_crm_case_categ() @@ -122,6 +124,7 @@ class report_crm_case_section(osv.osv): _columns = { 'name': fields.char('Year',size=64,required=False, readonly=True), # 'user_id':fields.many2one('res.users', 'User', readonly=True), + 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), 'nbr_cases': fields.integer('# of Cases', 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"), @@ -139,9 +142,8 @@ class report_crm_case_section(osv.osv): to_char(c.create_date, 'YYYY') as name, to_char(c.create_date, 'MM') as month, count(*) as nbr_cases, - 0 as avg_answers, - 0.0 as perc_done, - 0.0 as perc_cancel + c.section_id as section_id, + 0 as avg_answers from crm_case c group by to_char(c.create_date, 'YYYY'),to_char(c.create_date, 'MM'),c.section_id diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml index 2a51ad84274..e298795eb0f 100644 --- a/addons/report_crm/report_crm_view.xml +++ b/addons/report_crm/report_crm_view.xml @@ -30,6 +30,7 @@ + @@ -64,6 +65,7 @@ + @@ -92,6 +94,7 @@ + @@ -105,6 +108,7 @@
+ @@ -123,6 +127,7 @@ + @@ -157,6 +162,7 @@ + @@ -187,6 +193,7 @@ +