diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index 043ab2bfd28..2b6d4b34b42 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -494,17 +494,15 @@ class hr_job(osv.osv): _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) + """Applicant, priority count like number of star 3,2,1(star rating) """ + applicant_obj = self.pool.get('hr.applicant') res = {} - for position in self.browse(cr, uid,ids, context=context): + for position in self.browse(cr, uid, ids, context=context): res[position.id] = {} - priority1 = 0 - priority2 = 0 - priority3 = 0 - applicant_obj = self.pool.get('hr.applicant') + priority1, priority2, priority3 = 0 rate_ids = applicant_obj.search(cr, uid, [('job_id', '=', position.id)], context=context) - for applicant in self.pool.get('hr.applicant').browse(cr, uid, rate_ids, 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 @@ -518,7 +516,7 @@ class hr_job(osv.osv): return res def _get_department_mgr(self, cr, uid, ids, name, args, context=None): - """get manager image for specific job position. + """Get manager image for specific job position. """ res = {} employee_obj = self.pool.get('hr.employee') @@ -537,7 +535,7 @@ class hr_job(osv.osv): 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"), - 'depart_id': fields.function(_get_department_mgr, string='Department Manager', type="char"),#manager image in kanban + 'manager_id': fields.function(_get_department_mgr, string='Department Manager', type="char"),#manager image in kanban } _defaults = { 'alias_domain': False, # always hide alias during creation diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 9dbb00567d5..37cdf3a48d1 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -322,7 +322,7 @@ - + Applications hr.applicant kanban,tree,form,graph,calendar @@ -333,17 +333,17 @@ hr.job.kanban hr.job - + - + -
+
í
    @@ -355,28 +355,30 @@

    - + + +
    Expected in Recruitment
    -
    - - - + + +
    - - + +
    - +
    diff --git a/addons/hr_recruitment/static/src/css/job_position.css b/addons/hr_recruitment/static/src/css/job_position.css index 94bdee54f32..25a10a5d388 100644 --- a/addons/hr_recruitment/static/src/css/job_position.css +++ b/addons/hr_recruitment/static/src/css/job_position.css @@ -7,7 +7,7 @@ font-size:112%; margin:3px 0px; } -.openerp .oe_job_kanban{ +.openerp .oe_job_message{ float: right; margin-right: 80px; margin-top: -4px !important;