Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6427 from KanchanChauhan/salary-slip-indentation

Browse Source 
[Fix] Indentation fixed
This commit is contained in:
Nabin Hait 2016-09-21 18:40:21 +05:30 committed by GitHub
commit 0eb8eddef5
1 changed files with 4 additions and 6 deletions
Show Stats 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: