From 95b186268cbe8595baf7df36294cb35e8092a4bc Mon Sep 17 00:00:00 2001 From: Michelle Alva <50285544+michellealva@users.noreply.github.com> Date: Thu, 30 Apr 2020 16:24:51 +0530 Subject: [PATCH] fix: only check for payment_account on bank entry (#21445) * fix: only check for payment_account on bank entry Since all the fields (company, start and end date are mandatory before form submission, there is no need to check for them again after submission. * fix: cur_frm to frm Co-authored-by: Nabin Hait --- erpnext/hr/doctype/payroll_entry/payroll_entry.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.js b/erpnext/hr/doctype/payroll_entry/payroll_entry.js index d25eb6d7810..da25d7574e0 100644 --- a/erpnext/hr/doctype/payroll_entry/payroll_entry.js +++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.js @@ -249,7 +249,7 @@ const submit_salary_slip = function (frm) { let make_bank_entry = function (frm) { var doc = frm.doc; - if (doc.company && doc.start_date && doc.end_date && doc.payment_account) { + if (doc.payment_account) { return frappe.call({ doc: cur_frm.doc, method: "make_payment_entry", @@ -262,7 +262,8 @@ let make_bank_entry = function (frm) { freeze_message: __("Creating Payment Entries......") }); } else { - frappe.msgprint(__("Company, Payment Account, From Date and To Date is mandatory")); + frappe.msgprint(__("Payment Account is mandatory")); + frm.scroll_to_field('payment_account'); } };