From 175e637ed31aa2a998014cc366c015f53815a197 Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Fri, 8 Oct 2010 18:01:55 +0200 Subject: [PATCH] [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 --- addons/hr/hr.py | 1 + addons/hr_payroll/hr_payroll.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 0419445c82d..655b9d9bfd1 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -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), diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 70192dba702..bb5edbd8d18 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -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),