diff options
| author | Fabien Pinckaers <fp@openerp.com> | 2013-11-16 10:58:14 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@openerp.com> | 2013-11-16 10:58:14 +0100 |
| commit | 1129cc5d39652f47c807dea358a03dbdf3c26087 (patch) | |
| tree | 38092e2055efb6ba9eaf424825ded47fc5b48f4c | |
| parent | c69f31d82c4d855e9f978ec991cb1ed2e7e7db40 (diff) | |
[FIX] HR Recruitment, numbers
bzr revid: fp@openerp.com-20131116095814-xk9wu0mqhxrh847c
| -rw-r--r-- | addons/hr/hr.py | 3 | ||||
| -rw-r--r-- | addons/website_hr_recruitment/controllers/main.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 471d6f153b9..67bf36a262f 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -110,7 +110,7 @@ class hr_job(osv.osv): 'hr.employee': (_get_job_position, ['job_id'], 10), }, type='integer', multi='no_of_employee'), - 'no_of_recruitment': fields.float('Expected in Recruitment', help='Number of new employees you expect to recruit.'), + 'no_of_recruitment': fields.integer('Expected in Recruitment', help='Number of new employees you expect to recruit.'), 'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees', groups='base.group_user'), 'description': fields.text('Job Description'), 'requirements': fields.text('Requirements'), @@ -122,6 +122,7 @@ class hr_job(osv.osv): } _defaults = { 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr.job', context=c), + 'no_of_recruitment': 0, 'state': 'open', } diff --git a/addons/website_hr_recruitment/controllers/main.py b/addons/website_hr_recruitment/controllers/main.py index d30130914b5..776b5adb352 100644 --- a/addons/website_hr_recruitment/controllers/main.py +++ b/addons/website_hr_recruitment/controllers/main.py @@ -14,7 +14,7 @@ class website_hr_recruitment(http.Controller): def jobs(self, department=None, office=None, page=0): hr_job_obj = request.registry['hr.job'] domain = [] - jobpost_ids = hr_job_obj.search(request.cr, request.uid, domain, order="website_published desc,no_of_recruitment", context=request.context) + jobpost_ids = hr_job_obj.search(request.cr, request.uid, domain, order="website_published desc,no_of_recruitment desc", context=request.context) jobs = hr_job_obj.browse(request.cr, request.uid, jobpost_ids, request.context) departments = set() @@ -32,7 +32,7 @@ class website_hr_recruitment(http.Controller): domain += [('address_id','=', office.id)] if department: domain += [('department_id','=', department.id)] - jobpost_ids = hr_job_obj.search(request.cr, request.uid, domain, order="website_published,no_of_recruitment", context=request.context) + jobpost_ids = hr_job_obj.search(request.cr, request.uid, domain, order="website_published,no_of_recruitment desc", context=request.context) jobs = hr_job_obj.browse(request.cr, request.uid, jobpost_ids, request.context) return request.website.render("website_hr_recruitment.index", { |