pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] hr_payroll: fixed default rules

Browse Source 
bzr revid: qdp-launchpad@openerp.com-20110408163312-x26jnh5zr6erxmqm
This commit is contained in:
Quentin (OpenERP)
2011-04-08 18:33:12 +02:00
parent f7323eb1af
commit 0df1e74d79
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_payroll/hr_payroll_data.xml
+2 -2
View File
@@ -172,7 +172,7 @@
<field name="category_id" ref="hr_payroll.GROSS"/>
<field name="condition_select">none</field>
<field name="amount_select">code</field>
<field name="amount_python_compute">result = heads['BASIC'] + heads['ALW']</field>
<field name="amount_python_compute">result = heads['BASIC'] + ('ALW' in heads and heads['ALW'] or 0.0)</field>
</record>
<record id="hr_rule_net" model="hr.salary.rule">
@@ -182,7 +182,7 @@
<field name="category_id" ref="hr_payroll.NET"/>
<field name="condition_select">none</field>
<field name="amount_select">code</field>
<field name="amount_python_compute">result = heads['BASIC'] + heads['ALW'] - heads['DED']</field>
<field name="amount_python_compute">result = heads['BASIC'] + ('ALW' in heads and heads['ALW'] or 0.0) - ('DED' in heads and heads['DED'] or 0.0)</field>
</record>