diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 0a33ac9dd55..0b9e2174de6 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -384,7 +384,6 @@ - diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index e92fdb92c0b..cdc96be5ea0 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -492,28 +492,13 @@ class hr_job(osv.osv): _name = "hr.job" _inherits = {'mail.alias': 'alias_id'} - def _count_priority(self, cr, uid, ids, name, args, context=None): - """Applicant, priority count like number of star 3,2,1(star rating) - """ + def _application_count(self, cr, uid, ids, field_name, arg, context=None): + """Calculate total Applications per job""" + res = dict.fromkeys(ids, 0) applicant_obj = self.pool.get('hr.applicant') - res = {} - for position in self.browse(cr, uid, ids, context=context): - res[position.id] = {} - priority1 = 0 - priority2 = 0 - priority3 = 0 - rate_ids = applicant_obj.search(cr, uid, [('job_id', '=', position.id)], context=context) - for applicant in applicant_obj.browse(cr, uid, rate_ids, context=context): - if applicant.job_id.id == position.id: - if applicant.priority == '3': - priority3 += 1 - elif applicant.priority == '2': - priority2 += 1 - elif applicant.priority == '1': - priority1 += 1 - else: - pass - res[position.id] = {'priority1': priority1, 'priority2': priority2, 'priority3': priority3, 'total_application':len(rate_ids)} + applicant_ids = applicant_obj.search(cr, uid, [('job_id', 'in', ids)]) + for applicant in applicant_obj.browse(cr, uid, applicant_ids, context): + res[applicant.job_id.id] += 1 return res _columns = { @@ -521,7 +506,7 @@ class hr_job(osv.osv): 'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True, help="Email alias for this job position. New emails will automatically " "create new applicants for this job position."), - 'priority_count': fields.function(_count_priority, string='Total Priority Employees', type="char"), + 'application_count': fields.function(_application_count, type='integer', string="Total Applications"), 'manager_id': fields.related('department_id', 'manager_id', type='many2one', string='Department Manager', relation='hr.employee', readonly=True, store=True), 'alias_prefix': fields.char("Alias Name Prefix For Jobs",help="Default Prefix for Alias name of jobs"), } diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 4a5d9b9faf0..4cde91ba5fd 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -345,7 +345,7 @@ - + @@ -383,8 +383,8 @@
Expected New Employees