diff --git a/addons/crm_hr/report/report_crm_hr.py b/addons/crm_hr/report/report_crm_hr.py
index 970064ccb1f..4560f968769 100644
--- a/addons/crm_hr/report/report_crm_hr.py
+++ b/addons/crm_hr/report/report_crm_hr.py
@@ -1,6 +1,41 @@
from osv import fields,osv
import tools
+class report_crm_job_user(osv.osv):
+ _name = "report.crm.job.user"
+ _description = "Job 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_job_user')
+ cr.execute("""
+ create or replace view report_crm_job_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_job 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_job_user()
+
class report_crm_job_categ(osv.osv):
_name = "report.crm.job.categ"
_description = "Jobs by section and category"
@@ -38,4 +73,59 @@ class report_crm_job_categ(osv.osv):
)""")
report_crm_job_categ()
+class report_crm_job_section(osv.osv):
+ _name = "report.crm.job.section"
+ _description = "job by Section"
+ _auto = False
+ _inherit = "report.crm.case.section"
+
+ def _get_data(self, cr, uid, ids, field_name, arg, context={}):
+ res = {}
+ state_perc = 0.0
+ avg_ans = 0.0
+
+ for case in self.browse(cr, uid, ids, context):
+ if field_name != 'avg_answers':
+ state = field_name[5:]
+ cr.execute("select count(*) from crm_job where section_id =%s and state='%s'"%(case.section_id.id,state))
+ state_cases = cr.fetchone()[0]
+ perc_state = (state_cases / float(case.nbr_cases) ) * 100
+
+ res[case.id] = perc_state
+ else:
+ cr.execute('select count(*) from crm_case_log l where l.section_id=%s'%(case.section_id.id))
+ logs = cr.fetchone()[0]
+
+ avg_ans = logs / case.nbr_cases
+ res[case.id] = avg_ans
+
+ return res
+
+ _columns = {
+ '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"),
+ 'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"),
+ 'delay_close': fields.char('Delay to close', size=20, readonly=True),
+ }
+ _order = 'name desc, section_id'
+ def init(self, cr):
+ tools.drop_view_if_exists(cr, 'report_crm_job_section')
+ cr.execute("""
+ create or replace view report_crm_job_section as (
+ select
+ min(c.id) as id,
+ to_char(c.create_date, 'YYYY') as name,
+ to_char(c.create_date, 'MM') as month,
+ count(*) as nbr_cases,
+ c.section_id as section_id,
+ 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_job c
+ group by to_char(c.create_date, 'YYYY'),to_char(c.create_date, 'MM'),c.section_id
+ )""")
+report_crm_job_section()
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_hr/report_crm_hr_view.xml b/addons/crm_hr/report_crm_hr_view.xml
index f89fb61ea3c..d2ce5854d0f 100644
--- a/addons/crm_hr/report_crm_hr_view.xml
+++ b/addons/crm_hr/report_crm_hr_view.xml
@@ -188,63 +188,5 @@
-
-
-
- Jobs Report - Sections and Stage(Tree)
- report.crm.job.section.stage
-
- tree
-
-
-
-
-
-
-
-
-
-
- jobs Report - Sections and Stage(Form)
- report.crm.job.section.stage
- form
-
-
-
-
-
-
-
-
-
-
- Jobs Report - Sections and Stage(Graph)
- report.crm.job.section.stage
- graph
-
-
-
-
-
-
-
-
-
- Jobs Report - Sections and Stage(Select)
- report.crm.job.section.stage
- search
-
-
-
-
-
-
-
- report.crm.job.section.stage
- form
- graph,tree
-
-
-