odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] hr, hr_contract, hr_payroll: moved back the field bank_account on the hr.employee object into the HR module: even if it's used only in payroll it may be interssting to record that info before. besides, the view of hr_contract module was crashing 

bzr revid: qdp-launchpad@tinyerp.com-20101008160155-nwpaxwqyltc6d663
This commit is contained in:
qdp-launchpad@tinyerp.com 2010-10-08 18:01:55 +02:00
parent da285ce376
commit 175e637ed3
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/hr/hr.py
View File

@ -135,6 +135,7 @@ 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."),
'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
'work_phone': fields.related('address_id', 'phone', type='char', size=32, string='Work Phone', readonly=True),
'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail'),
'work_location': fields.char('Office Location', size=32),

1
addons/hr_payroll/hr_payroll.py
View File

@ -1470,7 +1470,6 @@ class hr_employee(osv.osv):
_columns = {
'passport_id':fields.many2one('hr.passport', 'Passport', required=False, domain="[('employee_id','=',active_id), ('address_id','=',address_home_id)]", help="Employee Passport Information"),
'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False),
'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True),
'otherid': fields.char('Other Id', size=64),