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

Show net total in salary slip log in Process Payroll. Fixed #7986

Browse Source
This commit is contained in:
Nabin Hait 2017-03-12 14:32:23 +05:30
parent c5204f56e2
commit 6923397ef6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,8 +148,10 @@ class ProcessPayroll(Document):
ss_obj = frappe.get_doc("Salary Slip",ss[0]) ss_obj = frappe.get_doc("Salary Slip",ss[0])
ss_dict = {} ss_dict = {}
ss_dict["Employee Name"] = ss_obj.employee_name ss_dict["Employee Name"] = ss_obj.employee_name
ss_dict["Total Pay"] = fmt_money(ss_obj.rounded_total,currency = frappe.defaults.get_global_default("currency")) ss_dict["Total Pay"] = fmt_money(ss_obj.net_pay,
currency = frappe.defaults.get_global_default("currency"))
ss_dict["Salary Slip"] = self.format_as_links(ss_obj.name)[0] ss_dict["Salary Slip"] = self.format_as_links(ss_obj.name)[0]
if ss_obj.net_pay<0: if ss_obj.net_pay<0:
not_submitted_ss.append(ss_dict) not_submitted_ss.append(ss_dict)
else: else: