| commit | faa525e4f1eba694e204a92327c47ca47577dd45 | [log] [tgz] |
|---|---|---|
| author | Kanchan Chauhan <angel143.dr@gmail.com> | Thu Dec 01 15:31:38 2016 +0530 |
| committer | Kanchan Chauhan <angel143.dr@gmail.com> | Thu Dec 01 15:31:38 2016 +0530 |
| tree | 45e9514051e9b393e4b2f6259dd61395611a3f6d | |
| parent | de932911b56c0982f01b62a5850135a40aca84c2 [diff] |
[Fix] Fixed condition and formula issue in Salary Slip
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index 1bceff7..3ffa4dd 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -84,6 +84,7 @@ if d.amount_based_on_formula: if d.formula: amount = eval(d.formula, None, data) + if amount: data[d.abbr] = amount return amount