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

[Fix] Fixed condition and formula issue in Salary Slip
2016-12-01 15:56:52 +05:30 · 2016-12-01 15:56:52 +05:30 · 79f0a97431
commit 79f0a97431
parent de932911b5 faa525e4f1
1 changed files with 1 additions and 0 deletions
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@ -84,6 +84,7 @@ class SalarySlip(TransactionBase):
 			if d.amount_based_on_formula:
 				if d.formula:
 					amount = eval(d.formula, None, data)
+			if amount:		
 				data[d.abbr] = amount
 			return amount