X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fhr%2Fhr.py;h=fd4826a309a270f5b23c120ccd81cdaafa46e0cb;hb=5fe8da2a3c6bada91d731f1d0ba395de1b4e2485;hp=af9b0db7afce57a2237d633401d960ef262a4a2d;hpb=c6968eaf3e4fcb54be5bb0fa61ebd2a11a62635e;p=odoo%2Fodoo.git diff --git a/addons/hr/hr.py b/addons/hr/hr.py index af9b0db..fd4826a 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -19,17 +19,33 @@ # ############################################################################## -import os - from osv import fields, osv -import tools -from tools.translate import _ + +import addons class hr_employee_category(osv.osv): + + def name_get(self, cr, uid, ids, context=None): + if not ids: + return [] + reads = self.read(cr, uid, ids, ['name','parent_id'], context=context) + res = [] + for record in reads: + name = record['name'] + if record['parent_id']: + name = record['parent_id'][1]+' / '+name + res.append((record['id'], name)) + return res + + def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None): + res = self.name_get(cr, uid, ids, context=context) + return dict(res) + _name = "hr.employee.category" _description = "Employee Category" _columns = { 'name': fields.char("Category", size=64, required=True), + 'complete_name': fields.function(_name_get_fnc, method=True, type="char", string='Name'), 'parent_id': fields.many2one('hr.employee.category', 'Parent Category', select=True), 'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories') } @@ -54,7 +70,7 @@ class hr_employee_marital_status(osv.osv): _name = "hr.employee.marital.status" _description = "Employee Marital Status" _columns = { - 'name': fields.char('Marital Status', size=32, required=True), + 'name': fields.char('Marital Status', size=32, required=True, translate=True), 'description': fields.text('Status Description'), } @@ -64,29 +80,44 @@ class hr_job(osv.osv): def _no_of_employee(self, cr, uid, ids, name, args, context=None): res = {} - for emp in self.browse(cr, uid, ids): - res[emp.id] = len(emp.employee_ids or []) + for job in self.browse(cr, uid, ids, context=context): + res[job.id] = len(job.employee_ids or []) + return res + + def _no_of_recruitement(self, cr, uid, ids, name, args, context=None): + res = {} + for job in self.browse(cr, uid, ids, context=context): + res[job.id] = job.expected_employees - job.no_of_employee return res _name = "hr.job" _description = "Job Description" _columns = { 'name': fields.char('Job Name', size=128, required=True, select=True), - 'expected_employees': fields.integer('Expected Employees', help='Required number of Employees'), - 'no_of_employee': fields.function(_no_of_employee, method=True, string='No of Employees', type='integer', help='Number of Employees selected'), + 'expected_employees': fields.integer('Expected Employees', help='Required number of Employees in total for that job.'), + 'no_of_employee': fields.function(_no_of_employee, method=True, string="No of Employee", help='Number of employee with that job.'), + 'no_of_recruitment': fields.function(_no_of_recruitement, method=True, string='Expected in Recruitment', readonly=True), 'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees'), 'description': fields.text('Job Description'), 'requirements': fields.text('Requirements'), 'department_id': fields.many2one('hr.department', 'Department'), 'company_id': fields.many2one('res.company', 'Company'), - 'state': fields.selection([('open', 'Open'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', readonly=True, required=True), + 'state': fields.selection([('open', 'In Position'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', readonly=True, required=True), } _defaults = { 'expected_employees': 1, 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr.job', context=c), - 'state': 'open' + 'state': 'open', } + def on_change_expected_employee(self, cr, uid, ids, expected_employee, no_of_employee, context=None): + if context is None: + context = {} + result = {} + if expected_employee: + result['no_of_recruitment'] = expected_employee - no_of_employee + return {'value': result} + def job_old(self, cr, uid, ids, *args): self.write(cr, uid, ids, {'state': 'old'}) return True @@ -117,8 +148,10 @@ class hr_employee(osv.osv): 'address_id': fields.many2one('res.partner.address', 'Working Address'), 'address_home_id': fields.many2one('res.partner.address', 'Home Address'), 'partner_id': fields.related('address_home_id', 'partner_id', type='many2one', relation='res.partner', readonly=True, help="Partner that is related to the current employee. Accounting transaction will be written on this partner belongs to employee."), - 'work_phone': fields.related('address_id', 'phone', type='char', string='Work Phone', readonly=True), - 'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail'), + 'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account Number', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"), + 'work_phone': fields.char('Work Phone', size=32, readonly=False), + 'mobile_phone': fields.char('Mobile', size=32, readonly=False), + 'work_email': fields.char('Work E-mail', size=240), 'work_location': fields.char('Office Location', size=32), 'notes': fields.text('Notes'), 'parent_id': fields.related('department_id', 'manager_id', relation='hr.employee', string='Manager', type='many2one', store=True, select=True, readonly=True, help="It is linked with manager of Department"), @@ -128,32 +161,36 @@ class hr_employee(osv.osv): 'coach_id': fields.many2one('hr.employee', 'Coach'), 'job_id': fields.many2one('hr.job', 'Job'), 'photo': fields.binary('Photo'), - 'passport_id':fields.char('Passport', size=64) + 'passport_id':fields.char('Passport No', size=64) } - def onchange_company(self, cr, uid, ids, company, context=None): - company_id = self.pool.get('res.company').browse(cr,uid,company) - for address in company_id.partner_id.address: - return {'value': {'address_id': address.id}} - return {'value':{}} + def onchange_address_id(self, cr, uid, ids, address, context=None): + if address: + address = self.pool.get('res.partner.address').browse(cr, uid, address, context=context) + return {'value': {'work_email': address.email, 'work_phone': address.phone}} + return {'value': {}} - def onchange_department(self, cr, uid, ids, department_id, context=None): - manager = self.pool.get('hr.department').browse(cr, uid, department_id).manager_id.id - return {'value': {'parent_id':manager or False}} + def onchange_company(self, cr, uid, ids, company, context=None): + address_id = False + if company: + company_id = self.pool.get('res.company').browse(cr, uid, company, context=context) + address = self.pool.get('res.partner').address_get(cr, uid, [company_id.partner_id.id], ['default']) + address_id = address and address['default'] or False + return {'value': {'address_id' : address_id}} def onchange_user(self, cr, uid, ids, user_id, context=None): - mail = self.pool.get('res.users').browse(cr,uid,user_id) - return {'value': {'work_email':mail.user_email}} - + work_email = False + if user_id: + work_email = self.pool.get('res.users').browse(cr, uid, user_id, context=context).user_email + return {'value': {'work_email' : work_email}} + def _get_photo(self, cr, uid, context=None): - return open(os.path.join( - tools.config['addons_path'], 'hr/image', 'photo.png'), - 'rb') .read().encode('base64') - + photo_path = addons.get_module_resource('hr','images','photo.png') + return open(photo_path, 'rb').read().encode('base64') + _defaults = { 'active': 1, 'photo': _get_photo, - 'address_id': lambda self,cr,uid,c: self.pool.get('res.partner.address').browse(cr, uid, uid, c).partner_id.id } def _check_recursion(self, cr, uid, ids, context=None): @@ -184,7 +221,7 @@ class hr_department(osv.osv): _inherit = 'hr.department' _columns = { 'manager_id': fields.many2one('hr.employee', 'Manager'), - 'member_ids': fields.one2many('hr.employee', 'department_id', 'Members'), + 'member_ids': fields.one2many('hr.employee', 'department_id', 'Members', readonly=True), } hr_department()