From 9afbd43f05d71b921c35cfee7f9a90bead244368 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 29 Aug 2024 11:46:29 +0530 Subject: [PATCH 1/2] refactor: better UX on Bank Clearance tool (cherry picked from commit 6a06e26d04b6fa50eab4068c9e26349560eb0fcb) # Conflicts: # erpnext/accounts/doctype/bank_clearance/bank_clearance.js --- .../doctype/bank_clearance/bank_clearance.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/erpnext/accounts/doctype/bank_clearance/bank_clearance.js b/erpnext/accounts/doctype/bank_clearance/bank_clearance.js index ddf7bc5dec6..4ff718c90c2 100644 --- a/erpnext/accounts/doctype/bank_clearance/bank_clearance.js +++ b/erpnext/accounts/doctype/bank_clearance/bank_clearance.js @@ -37,7 +37,16 @@ frappe.ui.form.on("Bank Clearance", { frm.disable_save(); frm.add_custom_button(__("Get Payment Entries"), () => frm.trigger("get_payment_entries")); +<<<<<<< HEAD frm.change_custom_button_type("Get Payment Entries", null, "primary"); +======= + 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"); + } +>>>>>>> 6a06e26d04 (refactor: better UX on Bank Clearance tool) }, update_clearance_date: function (frm) { @@ -45,6 +54,7 @@ frappe.ui.form.on("Bank Clearance", { method: "update_clearance_date", doc: frm.doc, callback: function (r, rt) { +<<<<<<< HEAD frm.refresh_field("payment_entries"); frm.refresh_fields(); @@ -52,6 +62,9 @@ frappe.ui.form.on("Bank Clearance", { frm.change_custom_button_type("Get Payment Entries", null, "primary"); frm.change_custom_button_type("Update Clearance Date", null, "default"); } +======= + frm.refresh(); +>>>>>>> 6a06e26d04 (refactor: better UX on Bank Clearance tool) }, }); }, @@ -60,6 +73,7 @@ frappe.ui.form.on("Bank Clearance", { return frappe.call({ method: "get_payment_entries", doc: frm.doc, +<<<<<<< HEAD callback: function (r, rt) { frm.refresh_field("payment_entries"); @@ -71,6 +85,10 @@ frappe.ui.form.on("Bank Clearance", { frm.change_custom_button_type("Get Payment Entries", null, "default"); frm.change_custom_button_type("Update Clearance Date", null, "primary"); } +======= + callback: function () { + frm.refresh(); +>>>>>>> 6a06e26d04 (refactor: better UX on Bank Clearance tool) }, }); }, From cfb5a6592c1ac55e120c737a18a913679d681243 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 29 Aug 2024 14:09:42 +0530 Subject: [PATCH 2/2] chore: resolve conflict --- .../doctype/bank_clearance/bank_clearance.js | 29 ------------------- 1 file changed, 29 deletions(-) diff --git a/erpnext/accounts/doctype/bank_clearance/bank_clearance.js b/erpnext/accounts/doctype/bank_clearance/bank_clearance.js index 4ff718c90c2..b614bff1ed1 100644 --- a/erpnext/accounts/doctype/bank_clearance/bank_clearance.js +++ b/erpnext/accounts/doctype/bank_clearance/bank_clearance.js @@ -36,17 +36,12 @@ frappe.ui.form.on("Bank Clearance", { refresh: function (frm) { frm.disable_save(); frm.add_custom_button(__("Get Payment Entries"), () => frm.trigger("get_payment_entries")); - -<<<<<<< HEAD - frm.change_custom_button_type("Get Payment Entries", null, "primary"); -======= 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"); } ->>>>>>> 6a06e26d04 (refactor: better UX on Bank Clearance tool) }, update_clearance_date: function (frm) { @@ -54,17 +49,7 @@ frappe.ui.form.on("Bank Clearance", { method: "update_clearance_date", doc: frm.doc, callback: function (r, rt) { -<<<<<<< HEAD - 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(); ->>>>>>> 6a06e26d04 (refactor: better UX on Bank Clearance tool) }, }); }, @@ -73,22 +58,8 @@ frappe.ui.form.on("Bank Clearance", { return frappe.call({ method: "get_payment_entries", doc: frm.doc, -<<<<<<< HEAD - 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(); ->>>>>>> 6a06e26d04 (refactor: better UX on Bank Clearance tool) }, }); },