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

[fix] enqueue salary slip print email after completing accounting entries (#13633)

Browse Source
This commit is contained in:
Saurabh 2018-04-16 11:08:49 +05:30 committed by Rushabh Mehta
parent f2a941b1a4
commit ea1408f2e0
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/hr/doctype/payroll_entry/payroll_entry.py
View File

@ -146,6 +146,7 @@ class PayrollEntry(Document):
ss_list = self.get_sal_slip_list(ss_status=0) ss_list = self.get_sal_slip_list(ss_status=0)
submitted_ss = [] submitted_ss = []
not_submitted_ss = [] not_submitted_ss = []
frappe.flags.via_payroll_entry = True
for ss in ss_list: for ss in ss_list:
ss_obj = frappe.get_doc("Salary Slip",ss[0]) ss_obj = frappe.get_doc("Salary Slip",ss[0])
ss_dict = {} ss_dict = {}
@ -159,7 +160,7 @@ class PayrollEntry(Document):
else: else:
try: try:
ss_obj.submit() ss_obj.submit()
submitted_ss.append(ss_dict) submitted_ss.append(ss_obj)
except frappe.ValidationError: except frappe.ValidationError:
not_submitted_ss.append(ss_dict) not_submitted_ss.append(ss_dict)
@ -168,8 +169,15 @@ class PayrollEntry(Document):
frappe.msgprint(_("Salary Slip submitted for period from {0} to {1}") frappe.msgprint(_("Salary Slip submitted for period from {0} to {1}")
.format(ss_obj.start_date, ss_obj.end_date)) .format(ss_obj.start_date, ss_obj.end_date))
self.email_salary_slip(submitted_ss)
return create_submit_log(submitted_ss, not_submitted_ss, jv_name) return create_submit_log(submitted_ss, not_submitted_ss, jv_name)
def email_salary_slip(self, submitted_ss):
if frappe.db.get_single_value("HR Settings", "email_salary_slip_to_employee"):
for ss in submitted_ss:
ss.email_salary_slip()
def get_loan_details(self): def get_loan_details(self):
""" """
Get loan details from submitted salary slip based on selected criteria Get loan details from submitted salary slip based on selected criteria

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

@ -411,7 +411,7 @@ class SalarySlip(TransactionBase):
else: else:
self.set_status() self.set_status()
self.update_status(self.name) self.update_status(self.name)
if(frappe.db.get_single_value("HR Settings", "email_salary_slip_to_employee")): if(frappe.db.get_single_value("HR Settings", "email_salary_slip_to_employee")) and not frappe.flags.via_payroll_entry:
self.email_salary_slip() self.email_salary_slip()
def on_cancel(self): def on_cancel(self):