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

[Fix] Salary slip is not saving (#15449)

Browse Source
This commit is contained in:
rohitwaghchaure 2018-09-20 13:18:49 +05:30 committed by Nabin Hait
parent 550fc695f1
commit a60ab1af75
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,7 +181,8 @@ class SalarySlip(TransactionBase):
if len(st_name) > 1: if len(st_name) > 1:
frappe.msgprint(_("Multiple active Salary Structures found for employee {0} for the given dates") frappe.msgprint(_("Multiple active Salary Structures found for employee {0} for the given dates")
.format(self.employee), title=_('Warning')) .format(self.employee), title=_('Warning'))
return st_name and st_name[0][0] or '' self.salary_structure = st_name and st_name[0][0] or ''
return self.salary_structure
else: else:
self.salary_structure = None self.salary_structure = None
frappe.msgprint(_("No active or default Salary Structure found for employee {0} for the given dates") frappe.msgprint(_("No active or default Salary Structure found for employee {0} for the given dates")