diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2011-05-27 12:13:22 +0200 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2011-05-27 12:13:22 +0200 |
| commit | e41d251cdc0a6665d456e4cf7c5d60b8f8ee95fc (patch) | |
| tree | cb18717e462e6bd6b4904a986bea7cd59b4813ec /addons/hr_payroll/hr_payroll_data.xml | |
| parent | 687210446269bdf507868eefb7a4e6a2108b705d (diff) | |
| parent | 253eaa325ec350040a38516fb7a0d0abb941d378 (diff) | |
[MERGE] hr_payroll: merged branch of mtr with browsable categories + fixed few points in it
[IMP] hr_payroll: improved BrowsableObject class to return 0.0 if the key isn't defined
[FIX] hr_payroll: fix the computation of categories
bzr revid: qdp-launchpad@openerp.com-20110527101322-k0lx0660feopt30i
Diffstat (limited to 'addons/hr_payroll/hr_payroll_data.xml')
| -rw-r--r-- | addons/hr_payroll/hr_payroll_data.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/hr_payroll_data.xml index c7ba6e62062..93212a550bc 100644 --- a/addons/hr_payroll/hr_payroll_data.xml +++ b/addons/hr_payroll/hr_payroll_data.xml @@ -49,7 +49,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 = categories['BASIC'] + ('ALW' in categories and categories['ALW'] or 0.0)</field> + <field name="amount_python_compute">result = categories.BASIC + categories.ALW</field> </record> <record id="hr_rule_net" model="hr.salary.rule"> @@ -59,7 +59,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 = categories['BASIC'] + ('ALW' in categories and categories['ALW'] or 0.0) + ('DED' in categories and categories['DED'] or 0.0)</field> + <field name="amount_python_compute">result = categories.BASIC + categories.ALW + categories.DED</field> </record> |