diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py index 4e2b160f3ea..2a2ab8fce2b 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report.py +++ b/addons/hr_recruitment/report/hr_recruitment_report.py @@ -69,10 +69,11 @@ class hr_recruitment_report(osv.osv): 'date_closed': fields.date('Closed', readonly=True), 'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True), 'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'), - 'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('object_id.model', '=', 'hr.applicant')]"), + 'type_id': fields.many2one('hr.recruitment.degree', 'Degree'), 'department_id':fields.many2one('hr.department','Department',readonly=True), 'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'), 'salary_prop' : fields.float("Salary Proposed"), + 'salary_prop_avg' : fields.float("Avg Salary Proposed", group_operator="avg"), 'salary_exp' : fields.float("Salary Expected"), 'partner_id': fields.many2one('res.partner', 'Partner',readonly=True), 'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact Name',readonly=True), @@ -107,6 +108,7 @@ class hr_recruitment_report(osv.osv): s.priority, s.stage_id, sum(salary_proposed) as salary_prop, + (sum(salary_proposed)/count(*)) as salary_prop_avg, sum(salary_expected) as salary_exp, extract('epoch' from (s.date_open-s.create_date))/(3600*24) as delay_open, extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as delay_close, diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index edb00d1f727..d527120c801 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -21,11 +21,12 @@ - - - - + + + + + @@ -49,18 +50,18 @@ - - + - + + domain="[('date','<=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','>',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" + help="Recruitment during last month"/> + - - + - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + @@ -127,7 +130,7 @@ hr.recruitment.report form tree,graph - {'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]} + {'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}