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

Merge pull request #10255 from tundebabzy/issue-10215

Browse Source 
Error when creating Bank Entry from Process Payroll (#10215)
This commit is contained in:
Nabin Hait 2017-08-03 10:20:31 +05:30 committed by GitHub
commit bfb3de771b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,7 +311,7 @@ class ProcessPayroll(Document):
journal_entry.submit() journal_entry.submit()
jv_name = journal_entry.name jv_name = journal_entry.name
self.update_salary_slip_status(jv_name = jv_name) self.update_salary_slip_status(jv_name = jv_name)
except Exception, e: except Exception as e:
frappe.msgprint(e) frappe.msgprint(e)
return jv_name return jv_name
@ -339,7 +339,12 @@ class ProcessPayroll(Document):
"debit_in_account_currency": total_salary_amount.rounded_total "debit_in_account_currency": total_salary_amount.rounded_total
}) })
journal_entry.set("accounts", account_amt_list) journal_entry.set("accounts", account_amt_list)
return journal_entry.as_dict() return journal_entry.as_dict()
else:
frappe.msgprint(
_("There are no submitted Salary Slips to process."),
title="Error", indicator="red"
)
def update_salary_slip_status(self, jv_name = None): def update_salary_slip_status(self, jv_name = None):
ss_list = self.get_sal_slip_list(ss_status=1) ss_list = self.get_sal_slip_list(ss_status=1)