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

[IMP] hr_payroll:improved 'hr.employee',commented m2m field i.e. Salary Rules on Employee 

bzr revid: mtr@mtr-20110303103321-ecd9eooj9l6ixlgo
This commit is contained in:
mtr 2011-03-03 16:03:21 +05:30
parent 533ea71235
commit 29a46c9f18
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_payroll/hr_payroll.py
View File

@ -1233,7 +1233,7 @@ class hr_employee(osv.osv):
'net': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Net Salary', digits=(14,2)),
'advantages_net': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Deductions', digits=(14,2)),
'advantages_gross': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Allowances', digits=(14,2)),
'emp_sal_rule_ids':fields.many2many('hr.salary.rule', 'hr_emp_salary_rule_rel', 'employee_id', 'rule_id', 'Salary Rules', readonly=False),
# 'emp_sal_rule_ids':fields.many2many('hr.salary.rule', 'hr_emp_salary_rule_rel', 'employee_id', 'rule_id', 'Salary Rules', readonly=False),
}
hr_employee()

4
addons/hr_payroll/hr_payroll_view.xml
View File

@ -107,11 +107,11 @@
</group>
</page>
</xpath>
<xpath expr="/form/notebook/page[@string='Categories']" position="after">
<!--<xpath expr="/form/notebook/page[@string='Categories']" position="after">
<page string="Salary Rules">
<field name="emp_sal_rule_ids" nolabel="1" widget="one2many_list"/>
</page>
</xpath>
</xpath>-->
</data>
</field>
</record>