diff --git a/addons/report_crm/report_crm_claim.py b/addons/report_crm/report_crm_claim.py index c32999754de..e78f2c8aa51 100644 --- a/addons/report_crm/report_crm_claim.py +++ b/addons/report_crm/report_crm_claim.py @@ -6,10 +6,6 @@ class report_crm_claim(osv.osv): _auto = False _inherit = "report.crm.case" _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_prob': fields.float('Est. Rev*Prob.', readonly=True), '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')]"), @@ -24,14 +20,13 @@ class report_crm_claim(osv.osv): to_char(c.create_date, 'MM') as month, c.state, c.user_id, - c.section_id, c.stage_id, + c.section_id, c.categ_id, count(*) as nbr, - sum(planned_revenue) as amount_revenue, - sum(planned_cost) as amount_costs, - sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob, - avg(probability)::decimal(16,2) as probability, + 0 as avg_answers, + 0.0 as perc_done, + 0.0 as perc_cancel, to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close from crm_claim c diff --git a/addons/report_crm/report_crm_claim_view.xml b/addons/report_crm/report_crm_claim_view.xml index 67933557a1c..22d4a2ba0f2 100644 --- a/addons/report_crm/report_crm_claim_view.xml +++ b/addons/report_crm/report_crm_claim_view.xml @@ -8,16 +8,16 @@ tree - + - - - - - - - - + + + + + + + + diff --git a/addons/report_crm/report_crm_fundraising.py b/addons/report_crm/report_crm_fundraising.py index 518e03c9a01..ef01c5246e5 100644 --- a/addons/report_crm/report_crm_fundraising.py +++ b/addons/report_crm/report_crm_fundraising.py @@ -31,8 +31,7 @@ class report_crm_fundraising(osv.osv): 0 as avg_answers, 0.0 as perc_done, 0.0 as perc_cancel, - 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 diff --git a/addons/report_crm/report_crm_fundraising_view.xml b/addons/report_crm/report_crm_fundraising_view.xml index da92023ee55..633023d3b4c 100644 --- a/addons/report_crm/report_crm_fundraising_view.xml +++ b/addons/report_crm/report_crm_fundraising_view.xml @@ -19,6 +19,7 @@ + diff --git a/addons/report_crm/report_crm_lead_view.xml b/addons/report_crm/report_crm_lead_view.xml index 97903e738f7..3b87dfe6ed8 100644 --- a/addons/report_crm/report_crm_lead_view.xml +++ b/addons/report_crm/report_crm_lead_view.xml @@ -16,6 +16,7 @@ + diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml index c55cf54e9c1..61fe7766ddf 100644 --- a/addons/report_crm/report_crm_view.xml +++ b/addons/report_crm/report_crm_view.xml @@ -56,7 +56,7 @@ - +