pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] crm : modification in fundraising and opportunity reports, add group_operator=avg attribute in for probeblity field

Browse Source 
bzr revid: vir@tinyerp.com-20100317114100-3ndbw5m37y2hg7ri
This commit is contained in:
RCH(Open ERP)
2010-03-17 17:11:00 +05:30
committed by Vir (Open ERP)
parent 36ed0af606
commit bf233b4f1c
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/report/crm_fundraising_report.py
+4 -4
View File
@@ -7,12 +7,12 @@ class crm_fundraising_report(osv.osv):
_inherit = "crm.case.report"
_columns = {
'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.fundraising')]"),
'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),
'partner_id': fields.many2one('res.partner', 'Partner'),
'company_id': fields.many2one('res.company','Company'),
'partner_id': fields.many2one('res.partner', 'Partner'),
'company_id': fields.many2one('res.company','Company'),
}
def init(self, cr):
tools.drop_view_if_exists(cr, 'crm_fundraising_report')
@@ -32,7 +32,7 @@ class crm_fundraising_report(osv.osv):
0 as avg_answers,
0.0 as perc_done,
0.0 as perc_cancel,
sum(planned_revenue) as amount_revenue,
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
addons/crm/report/crm_opportunity_report.py
+8 -8
View File
@@ -2,19 +2,19 @@ from osv import fields,osv
import tools
class crm_opportunity_report(osv.osv):
_name = "crm.opportunity.report"
_name = "crm.opportunity.report"
_auto = False
_inherit = "crm.case.report"
_inherit = "crm.case.report"
_columns = {
'probability': fields.float('Avg. Probability', readonly=True),
'amount_revenue': fields.float('Est.Revenue', 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),
'categ_id': fields.many2one('crm.case.categ', 'Category', 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',readonly=True),
'company_id': fields.many2one('res.company', 'Company',readonly=True),
'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
'company_id': fields.many2one('res.company', 'Company',readonly=True),
}
def init(self, cr):
tools.drop_view_if_exists(cr, 'crm_opportunity_report')
@@ -35,7 +35,7 @@ class crm_opportunity_report(osv.osv):
0 as avg_answers,
0.0 as perc_done,
0.0 as perc_cancel,
sum(planned_revenue) as amount_revenue,
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