diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py index 908b701d928..e83b0d2cc3e 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report.py +++ b/addons/hr_recruitment/report/hr_recruitment_report.py @@ -34,18 +34,8 @@ class hr_recruitment_report(osv.Model): _columns = { 'user_id': fields.many2one('res.users', 'User', readonly=True), - 'nbr': fields.integer('# of Applications', readonly=True), - # TDE TODO: use MONTHS - '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), 'company_id': fields.many2one('res.company', 'Company', readonly=True), - 'day': fields.char('Day', size=128, readonly=True), - 'year': fields.char('Year', size=4, readonly=True), - 'date_create': fields.date('Create Date', readonly=True), + 'date_create': fields.datetime('Create Date', readonly=True), 'date_last_stage_update': fields.datetime('Last Stage Update', readonly=True), 'date_closed': fields.date('Closed', readonly=True), 'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True), @@ -70,7 +60,7 @@ class hr_recruitment_report(osv.Model): create or replace view hr_recruitment_report as ( select min(s.id) as id, - date_trunc('day',s.create_date) as date_create, + s.create_date as date_create, date_trunc('day',s.date_closed) as date_closed, date_trunc('day',s.date_last_stage_update) as date_last_stage_update, to_char(s.create_date, 'YYYY') as year, @@ -94,9 +84,6 @@ class hr_recruitment_report(osv.Model): count(*) as nbr from hr_applicant s group by - to_char(s.create_date, 'YYYY'), - to_char(s.create_date, 'MM'), - to_char(s.create_date, 'YYYY-MM-DD') , date_trunc('day',s.create_date), date_trunc('day',s.date_closed), s.date_open, @@ -117,3 +104,5 @@ class hr_recruitment_report(osv.Model): """) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + + diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index 56d0e61a1f6..c214b2efa75 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -6,8 +6,9 @@ hr.recruitment.report - - + + + @@ -42,9 +43,10 @@ - - - + + + + @@ -55,7 +57,7 @@ hr.recruitment.report form graph - {'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]} + {'group_by_no_leaf':1,'group_by':[]}