diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py index 1e917d83710..560cfe17fd9 100644 --- a/addons/crm/report/crm_opportunity_report.py +++ b/addons/crm/report/crm_opportunity_report.py @@ -29,10 +29,10 @@ class crm_opportunity_report(osv.osv): _inherit = "crm.case.report" _description = "CRM Opportunity Report" _columns = { - 'probability': fields.float('Avg. Probability', readonly=True), + 'probability': fields.float('Avg. Probability', readonly=True, group_operator="avg"), '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), + 'delay_close': fields.float('Delay to close', digits=(16,2), readonly=True, group_operator="avg"), 'categ_id': fields.many2one('crm.case.categ', 'Category',\ domain="[('section_id','=',section_id),\ ('object_id.model', '=', 'crm.opportunity')]", readonly=True), @@ -70,7 +70,7 @@ class crm_opportunity_report(osv.osv): sum(planned_revenue) as amount_revenue, sum((planned_revenue*probability)/100.0)::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 + avg(extract('epoch' from (date_closed-c.create_date)))/3600 as delay_close from crm_opportunity c group by diff --git a/addons/crm/report/crm_opportunity_report_view.xml b/addons/crm/report/crm_opportunity_report_view.xml index 3ee8498fb3a..8cd174843a7 100644 --- a/addons/crm/report/crm_opportunity_report_view.xml +++ b/addons/crm/report/crm_opportunity_report_view.xml @@ -9,18 +9,18 @@ crm.opportunity.report tree - - - - - - - - + + + + + + + + - + @@ -37,7 +37,7 @@ form - + @@ -69,15 +69,15 @@ search - - - - - + + + + + @@ -88,25 +88,25 @@ crm.opportunity.report form tree,graph - {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1} + {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1, "group_by": [], 'group_by_no_leaf': 1} - - - tree - - - + + + tree + + + - - graph - - - + + graph + + + + action="action_report_crm_opportunity" + id="menu_report_crm_opportunity_tree" parent="base.next_id_64" />