From 49ed5e133660192433c9aa83cd5ec77bfc68d075 Mon Sep 17 00:00:00 2001 From: Osenda <> Date: Thu, 24 Mar 2011 10:11:03 +0100 Subject: [PATCH] [IMP] hr_payroll: changes on payslip bzr revid: osenda-20110324091103-1krcvxhz38lf5bup --- addons/hr_payroll/hr_payroll.py | 13 ++++++++++++- addons/hr_payroll/hr_payroll_view.xml | 12 ++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 7a56463401a..ac26b901df8 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -1177,6 +1177,17 @@ class hr_payslip(osv.osv): }) return update + def onchange_contract_id(self, cr, uid, ids, contract_id=False, struct_id=False, context=None): + if not contract_id: + return {} + res = {} + contract = self.pool.get('hr.contract').browse(cr,uid, contract_id) + res.update({ + 'struct_id':contract.struct_id.id + }) + + return {'value': res} + hr_payslip() class hr_holidays(osv.osv): @@ -1363,4 +1374,4 @@ class hr_employee(osv.osv): hr_employee() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 75beacfa62e..65b229f40d0 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -212,6 +212,9 @@ + + + @@ -275,13 +278,18 @@ - - + + + + + + +