| commit | 1f1ffd79e2d7e793bf2ca0dc3eee566b731205a1 | [log] [tgz] |
|---|---|---|
| author | Nabin Hait <nabinhait@gmail.com> | Thu Dec 01 16:12:46 2016 +0530 |
| committer | GitHub <noreply@github.com> | Thu Dec 01 16:12:46 2016 +0530 |
| tree | 879e3be93c0234e054ee763611861967baf62046 | |
| parent | 79f0a97431739ca9eeed47c5d083f5f5b9078796 [diff] | |
| parent | c92e2f904407df63ddf3357a93a771f6b01c1750 [diff] |
Merge pull request #7109 from RobertSchouten/project_wise [fix] Project wise Stock Tracking is script report
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