diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 364f9f5d954..471d6f153b9 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -97,22 +97,18 @@ class hr_job(osv.osv): _inherit = ['mail.thread'] _columns = { 'name': fields.char('Job Name', size=128, required=True, select=True), - # TO CLEAN: when doing a cleaning, we should change like this: - # no_of_recruitment: a function field - # expected_employees: float - # This would allow a clean update when creating new employees. 'expected_employees': fields.function(_no_of_employee, string='Total Forecasted Employees', help='Expected number of employees for this job position after new recruitment.', store = { 'hr.job': (lambda self,cr,uid,ids,c=None: ids, ['no_of_recruitment'], 10), 'hr.employee': (_get_job_position, ['job_id'], 10), - }, + }, type='integer', multi='no_of_employee'), 'no_of_employee': fields.function(_no_of_employee, string="Current Number of Employees", help='Number of employees currently occupying this job position.', store = { '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.'), 'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees', groups='base.group_user'), diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml index 79d1e3cbec6..17059f217f5 100644 --- a/addons/hr/hr_demo.xml +++ b/addons/hr/hr_demo.xml @@ -31,7 +31,7 @@ Chief Executive Officer - Demonstration of different openerp services for each client and convincing the client about functionality of the application. + Demonstration of different openerp services for each client and convincing the client about functionality of the application. The candidate should have excellent communication skills. Relationship building and influencing skills Expertise in New Client Acquisition (NCAs) and Relationship Management. @@ -39,15 +39,15 @@ Gathering market and customer information. Coordinating with the sales and support team for adopting different strategies Reviewing progress and identifying opportunities and new areas for development. Building strong relationships with clients / customers for business growth profitability. -Keep regular interaction with key clients for better extraction and expansion. ]]> - MBA in Marketing is must. +Keep regular interaction with key clients for better extraction and expansion. + MBA in Marketing is must. Good Communication skills. Only Fresher's can apply. Candidate should be ready to work in young and dynamic environment.. Candidate should be able to work in “start- up” fast paced environment,hands on attitude. Honest,approachable and fun team player. Result driven. -Excellent analytical skills, ability to think logically and "out of the box" ]]> +Excellent analytical skills, ability to think logically and "out of the box" diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index 10de39399e4..4e7ebfd607c 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -466,6 +466,13 @@ class hr_job(osv.osv): 'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True, help="Email alias for this job position. New emails will automatically " "create new applicants for this job position."), + 'address_id': fields.many2one('res.partner', 'Job Location', help="Address where employees are working"), + } + def _address_get(self, cr, uid, context=None): + user = self.pool.get('res.users').browse(cr, uid, uid, context=context) + return user.company_id.partner_id.id + _defaults = { + 'address_id': _address_get } def _auto_init(self, cr, context=None): diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 035629c31a1..8300282db16 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -306,7 +306,14 @@ hr.job - + + +