[IMP] hr_payroll:added Child Rules as one2many on Salary Rules
bzr revid: mtr@mtr-20110225133339-0f0711n4kaijl6p6
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -940,6 +940,11 @@
|
||||
<field name="company_contrib"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Child Rules" groups="base.group_extended">
|
||||
<separator colspan="4" string="Children definition"/>
|
||||
<field name="child_depend"/>
|
||||
<field colspan="4" name="child_ids" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Function">
|
||||
<field name="line_ids" colspan="4" nolabel="1" attrs="{'readonly':[('amount_type','!=','func')]}">
|
||||
<tree string="Function Arguments" editable="bottom">
|
||||
|
||||
Reference in New Issue
Block a user