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

[MERGE] forward port branch saas-6 up to 2cc44f5c62

Browse Source
This commit is contained in:
Christophe Simonis
2017-02-23 13:45:34 +01:00
parent bbe7cdf05f 2cc44f5c62
commit f3491a27a5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_payroll/hr_payroll.py
+3 -1
View File
@@ -456,7 +456,9 @@ class hr_payslip(osv.osv):
def _sum_salary_rule_category(localdict, category, amount):
if category.parent_id:
localdict = _sum_salary_rule_category(localdict, category.parent_id, amount)
localdict['categories'].dict[category.code] = category.code in localdict['categories'].dict and localdict['categories'].dict[category.code] + amount or amount
if category.code in localdict['categories'].dict:
amount += localdict['categories'].dict[category.code]
localdict['categories'].dict[category.code] = amount
return localdict
class BrowsableObject(object):