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

[Fix] Indentation fixed

Browse Source
This commit is contained in:
Kanchan Chauhan
2016-09-21 17:28:42 +05:30
parent 0be6073f10
commit 2142a0ab37
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,15 +79,13 @@ class SalarySlip(TransactionBase):
if d.condition: if d.condition:
if not eval(d.condition, None, data): if not eval(d.condition, None, data):
return None return None
amount = d.amount amount = d.amount
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)
data[d.abbr] = amount data[d.abbr] = amount
return amount return amount
except NameError as err: except NameError as err:
frappe.throw(_("Name error: {0}".format(err))) frappe.throw(_("Name error: {0}".format(err)))
except SyntaxError as err: except SyntaxError as err: