nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 21:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7112 from KanchanChauhan/salary-slip-issue

Browse Source 
[Fix] Fixed condition and formula issue in Salary Slip
This commit is contained in:
Nabin Hait
2016-12-01 15:56:52 +05:30
committed by GitHub
parent de932911b5 faa525e4f1
commit 79f0a97431
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/hr/doctype/salary_slip/salary_slip.py
View File

@@ -84,6 +84,7 @@ class SalarySlip(TransactionBase):
if d.amount_based_on_formula: if d.amount_based_on_formula:
if d.formula: if d.formula:
amount = eval(d.formula, None, data) amount = eval(d.formula, None, data)
if amount:
data[d.abbr] = amount data[d.abbr] = amount
return amount return amount