diff --git a/addons/report_crm/__init__.py b/addons/report_crm/__init__.py index 0c7693b19e0..e07c9ee2a69 100644 --- a/addons/report_crm/__init__.py +++ b/addons/report_crm/__init__.py @@ -20,6 +20,7 @@ ############################################################################## import report_crm +import report_crm_lead # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_crm/__terp__.py b/addons/report_crm/__terp__.py index dabe76d37db..c007f1fe46f 100644 --- a/addons/report_crm/__terp__.py +++ b/addons/report_crm/__terp__.py @@ -30,7 +30,7 @@ 'website': 'http://www.openerp.com', 'depends': ['crm'], 'init_xml': [], - 'update_xml': ['security/ir.model.access.csv', 'report_crm_view.xml'], + 'update_xml': ['security/ir.model.access.csv', 'report_crm_view.xml', 'report_crm_lead_view.xml'], 'demo_xml': [], 'installable': True, #TODO : After fixed problems , set True 'active': False, diff --git a/addons/report_crm/report_crm.py b/addons/report_crm/report_crm.py index d5e490627b7..55b4bdc3eec 100644 --- a/addons/report_crm/report_crm.py +++ b/addons/report_crm/report_crm.py @@ -39,7 +39,6 @@ class report_crm_case_user(osv.osv): 'user_id':fields.many2one('res.users', 'User', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True), - 'probability': fields.float('Avg. Probability', 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'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True), diff --git a/addons/report_crm/report_crm_lead.py b/addons/report_crm/report_crm_lead.py new file mode 100644 index 00000000000..90586ef5c2e --- /dev/null +++ b/addons/report_crm/report_crm_lead.py @@ -0,0 +1,77 @@ +from osv import fields,osv +import tools + +class report_crm_lead_user(osv.osv): + _name = "report.crm.lead.user" + _description = "Leads by user and section" + _auto = False + _inherit = "report.crm.case.user" + _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), + } + def init(self, cr): + tools.drop_view_if_exists(cr, 'report_crm_lead_user') + cr.execute(""" + create or replace view report_crm_lead_user as ( + select + min(c.id) as id, + to_char(c.create_date, 'YYYY') as name, + to_char(c.create_date, 'MM') as month, + c.state, + c.user_id, + c.section_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, + to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close + from + crm_lead c + group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id + )""") +report_crm_lead_user() + +class report_crm_lead_categ(osv.osv): + _name = "report.crm.lead.categ" + _description = "Leads by section and category" + _auto = False + _inherit = "report.crm.case.categ" + _columns = { + 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"), + '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), + 'probability': fields.float('Avg. Probability', readonly=True), + 'delay_close': fields.char('Delay Close', size=20, readonly=True), + } + + def init(self, cr): + tools.drop_view_if_exists(cr, 'report_crm_lead_categ') + cr.execute(""" + create or replace view report_crm_lead_categ as ( + select + min(c.id) as id, + to_char(c.create_date, 'YYYY') as name, + to_char(c.create_date, 'MM') as month, + c.categ_id, + c.state, + c.section_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, + to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close + from + crm_lead c + group by c.categ_id,to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state,c.section_id + )""") +report_crm_lead_categ() + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/report_crm/report_crm_lead_view.xml b/addons/report_crm/report_crm_lead_view.xml new file mode 100644 index 00000000000..e14b5d46927 --- /dev/null +++ b/addons/report_crm/report_crm_lead_view.xml @@ -0,0 +1,142 @@ + + + + + + + report.crm.lead.user.tree + report.crm.lead.user + + tree + + + + + + + + + + + + report.crm.lead.user.form + report.crm.lead.user + + form + + + + + + + + + + + + + report.crm.lead.user.graph + report.crm.lead.user + graph + + + + + + + + + + + report.crm.lead.user.select + report.crm.lead.user + + search + + + + + + + + Leads by User and Section + report.crm.lead.user + form + tree,graph + + + + + + + + + + report.crm.lead.categ.tree + report.crm.lead.categ + + tree + + + + + + + + + + + + report.crm.lead.categ.form + report.crm.lead.categ + + form + + + + + + + + + + + + + report.crm.lead.categ.graph + report.crm.lead.categ + graph + + + + + + + + + + + report.crm.lead.categ.select + report.crm.lead.categ + + search + + + + + + + + Leads by Categories and Section + report.crm.lead.categ + form + tree,graph + + + + + + + \ No newline at end of file