From 760b078dc99817b1ebb447ce0b5db4e74e11ba26 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Wed, 14 Aug 2019 14:40:00 +0530 Subject: [PATCH] fix(payroll-entry): commit submitted salary slip check on change (#18694) * fix(payroll-entry): commit submitted salary slip check onchange * fix: track submitted ss via flags --- erpnext/hr/doctype/payroll_entry/payroll_entry.js | 2 +- erpnext/hr/doctype/payroll_entry/payroll_entry.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.js b/erpnext/hr/doctype/payroll_entry/payroll_entry.js index e4ab68068c..adc06712ef 100644 --- a/erpnext/hr/doctype/payroll_entry/payroll_entry.js +++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.js @@ -69,7 +69,7 @@ frappe.ui.form.on('Payroll Entry', { }, add_context_buttons: function(frm) { - if(frm.doc.salary_slips_submitted) { + if(frm.doc.salary_slips_submitted || (frm.doc.__onload && frm.doc.__onload.submitted_ss)) { frm.events.add_bank_entry_button(frm); } else if(frm.doc.salary_slips_created) { frm.add_custom_button(__("Submit Salary Slip"), function() { diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.py b/erpnext/hr/doctype/payroll_entry/payroll_entry.py index 8803a9a84e..9b988e0412 100644 --- a/erpnext/hr/doctype/payroll_entry/payroll_entry.py +++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.py @@ -18,9 +18,8 @@ class PayrollEntry(Document): # check if salary slips were manually submitted entries = frappe.db.count("Salary Slip", {'payroll_entry': self.name, 'docstatus': 1}, ['name']) - if cint(entries) == len(self.employees) and not self.salary_slips_submitted: - self.db_set("salary_slips_submitted", 1) - self.reload() + if cint(entries) == len(self.employees): + self.set_onload("submitted_ss", True) def on_submit(self): self.create_salary_slips() @@ -429,7 +428,6 @@ def get_start_end_dates(payroll_frequency, start_date=None, company=None): 'start_date': start_date, 'end_date': end_date }) - def get_frequency_kwargs(frequency_name): frequency_dict = { 'monthly': {'months': 1},