diff options
| author | Vir (Open ERP) <vir@tinyerp.com> | 2010-09-11 15:02:15 +0530 |
|---|---|---|
| committer | Vir (Open ERP) <vir@tinyerp.com> | 2010-09-11 15:02:15 +0530 |
| commit | 8882b118d3571bae4e3ea39b15e83d98e27d7fc7 (patch) | |
| tree | 29a57207320bf00777757734307dc8b62dc4f860 | |
| parent | a8f2a74385f99f419a4d231e5e6e3f60f90e9947 (diff) | |
[MOD] hr : passport field set as char,and added on_change method
bzr revid: vir@tinyerp.com-20100911093215-sbr079z0rwpj2r6n
| -rw-r--r-- | addons/hr_payroll/hr_payroll.py | 13 | ||||
| -rw-r--r-- | addons/hr_payroll/hr_payroll_view.xml | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 7a6eaf14b58..a1f09ba2c26 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -136,7 +136,8 @@ class hr_contract(osv.osv): _columns = { 'permit_no':fields.char('Work Permit No', size=256, required=False, readonly=False), - 'passport_id':fields.many2one('hr.passport', 'Passport', required=False), +# 'passport_id':fields.many2one('hr.passport', 'Passport', required=False), + 'passport_id':fields.char('Passport',size=64, required=False), 'visa_no':fields.char('Visa No', size=64, required=False, readonly=False), 'visa_expire': fields.date('Visa Expire Date'), 'struct_id' : fields.many2one('hr.payroll.structure', 'Salary Structure'), @@ -145,6 +146,14 @@ class hr_contract(osv.osv): _defaults = { 'working_days_per_week': lambda *a: 5, } + + def on_change_employee_id(self, cr, uid, ids, employee_id): + v = {} + passport = self.pool.get('hr.employee').browse(cr, uid, employee_id).passport_id + if passport: + v['passport_id'] = passport + return {'value': v} + hr_contract() class payroll_register(osv.osv): @@ -1311,7 +1320,7 @@ class hr_employee(osv.osv): 'pg_joining': fields.date('PF Join Date'), 'esi_account':fields.char('ESI Account', size=64, required=False, readonly=False, help="ESI Account"), 'hospital_id':fields.many2one('res.partner.address', 'ESI Hospital', required=False), - 'passport_id':fields.many2one('hr.passport', 'Passport', required=False), + 'passport_id':fields.char('Passport', size=64), 'otherid':fields.char('Other Id', size=64, required=False), 'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', required=False, readonly=False), 'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False), diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 3a9dc5e00d1..eae16d820de 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -225,7 +225,7 @@ <form string="Contract"> <group colspan="4" col="6"> <field name="name" select="1"/> - <field name="employee_id" select="1"/> + <field name="employee_id" select="1" on_change="on_change_employee_id(employee_id)"/> <field name="job_id"/> <field name="wage"/> <field name="wage_type_id" widget="selection"/> |