diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py index 52647ce7d80..dccaa3dae0e 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report.py +++ b/addons/hr_recruitment/report/hr_recruitment_report.py @@ -30,6 +30,10 @@ class hr_recruitment_report(osv.osv): _auto = False _rec_name = 'date' _columns = { + 'year': fields.char('Year', size=4, 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), 'date': fields.datetime('Date', readonly=True), 'date_closed': fields.datetime('Closed', readonly=True), 'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True), @@ -48,7 +52,7 @@ class hr_recruitment_report(osv.osv): min(s.id) as id, date_trunc('day',s.date) as date, date_trunc('day',s.date_closed) as date_closed, - to_char(s.date, 'YYYY') as name, + to_char(s.date, 'YYYY') as year, to_char(s.date, 'MM') as month, s.state, s.company_id, @@ -61,7 +65,8 @@ class hr_recruitment_report(osv.osv): count(*) as nbr from hr_applicant s group by - s.date, + to_char(s.date, 'YYYY'), + to_char(s.date, 'MM'), date_trunc('day',s.date), date_trunc('day',s.date_closed), s.state, diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index e9e4869b6e6..8d0cc05f4a0 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -12,10 +12,11 @@ + - + @@ -96,12 +97,11 @@ - - + - + @@ -109,7 +109,7 @@ - + @@ -120,6 +120,7 @@ hr.recruitment.report form tree,graph + {'search_default_Stage': 1,'search_default_date': time.strftime('%Y/%m/%d %H:%M:%S') }