From e703cdfad180ecff6d11a766df983c30f250276c Mon Sep 17 00:00:00 2001 From: mtr Date: Fri, 25 Feb 2011 19:03:39 +0530 Subject: [PATCH] [IMP] hr_payroll:added Child Rules as one2many on Salary Rules bzr revid: mtr@mtr-20110225133339-0f0711n4kaijl6p6 --- addons/hr_payroll/hr_payroll.py | 3 +++ addons/hr_payroll/hr_payroll_view.xml | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 20af0cd4b4f..04499f54a74 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -1371,6 +1371,9 @@ class hr_salary_rule(osv.osv): 'min_range': fields.float('Minimum Range', required=False), 'max_range': fields.float('Maximum Range', required=False), 'contribute_ids':fields.one2many('company.contribution', 'category_id', 'Contributions', required=False), + 'sal_rule_id':fields.many2one('hr.salary.rule', 'Parent Salary Structure', select=True), + 'child_depend':fields.boolean('Tax on Children'), + 'child_ids':fields.one2many('hr.salary.rule', 'sal_rule_id', 'Child Salary Sructure'), } _defaults = { 'active': 1 diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 91a0849c6c8..d73e6cc310c 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -940,6 +940,11 @@ + + + + +