From db746a4def25f0869708e480db8f1ecef95aba55 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 29 Aug 2024 11:46:29 +0530 Subject: [PATCH] refactor: better UX on Bank Clearance tool (cherry picked from commit 6a06e26d04b6fa50eab4068c9e26349560eb0fcb) --- .../doctype/bank_clearance/bank_clearance.js | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/erpnext/accounts/doctype/bank_clearance/bank_clearance.js b/erpnext/accounts/doctype/bank_clearance/bank_clearance.js index 2993825482c..7ece7c9c2d6 100644 --- a/erpnext/accounts/doctype/bank_clearance/bank_clearance.js +++ b/erpnext/accounts/doctype/bank_clearance/bank_clearance.js @@ -38,6 +38,11 @@ frappe.ui.form.on("Bank Clearance", { frm.add_custom_button(__("Get Payment Entries"), () => frm.trigger("get_payment_entries")); frm.change_custom_button_type(__("Get Payment Entries"), null, "primary"); + if (frm.doc.payment_entries.length) { + frm.add_custom_button(__("Update Clearance Date"), () => frm.trigger("update_clearance_date")); + frm.change_custom_button_type(__("Get Payment Entries"), null, "default"); + frm.change_custom_button_type(__("Update Clearance Date"), null, "primary"); + } }, update_clearance_date: function (frm) { @@ -45,13 +50,7 @@ frappe.ui.form.on("Bank Clearance", { method: "update_clearance_date", doc: frm.doc, callback: function (r, rt) { - frm.refresh_field("payment_entries"); - frm.refresh_fields(); - - if (!frm.doc.payment_entries.length) { - frm.change_custom_button_type(__("Get Payment Entries"), null, "primary"); - frm.change_custom_button_type(__("Update Clearance Date"), null, "default"); - } + frm.refresh(); }, }); }, @@ -60,17 +59,8 @@ frappe.ui.form.on("Bank Clearance", { return frappe.call({ method: "get_payment_entries", doc: frm.doc, - callback: function (r, rt) { - frm.refresh_field("payment_entries"); - - if (frm.doc.payment_entries.length) { - frm.add_custom_button(__("Update Clearance Date"), () => - frm.trigger("update_clearance_date") - ); - - frm.change_custom_button_type(__("Get Payment Entries"), null, "default"); - frm.change_custom_button_type(__("Update Clearance Date"), null, "primary"); - } + callback: function () { + frm.refresh(); }, }); },