nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-30 18:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: better UX on Bank Clearance tool

Browse Source 
(cherry picked from commit 6a06e26d04)

# Conflicts:
#	erpnext/accounts/doctype/bank_clearance/bank_clearance.js
This commit is contained in:
ruthra kumar
2024-08-29 11:46:29 +05:30
committed by Mergify
parent 9db7f7b033
commit 9afbd43f05
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/accounts/doctype/bank_clearance/bank_clearance.js
View File

@@ -37,7 +37,16 @@ frappe.ui.form.on("Bank Clearance", {
frm.disable_save(); frm.disable_save();
frm.add_custom_button(__("Get Payment Entries"), () => frm.trigger("get_payment_entries")); 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");
=======
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) { update_clearance_date: function (frm) {
@@ -45,6 +54,7 @@ frappe.ui.form.on("Bank Clearance", {
method: "update_clearance_date", method: "update_clearance_date",
doc: frm.doc, doc: frm.doc,
callback: function (r, rt) { callback: function (r, rt) {
<<<<<<< HEAD
frm.refresh_field("payment_entries"); frm.refresh_field("payment_entries");
frm.refresh_fields(); 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("Get Payment Entries", null, "primary");
frm.change_custom_button_type("Update Clearance Date", null, "default"); 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({ return frappe.call({
method: "get_payment_entries", method: "get_payment_entries",
doc: frm.doc, doc: frm.doc,
<<<<<<< HEAD
callback: function (r, rt) { callback: function (r, rt) {
frm.refresh_field("payment_entries"); 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("Get Payment Entries", null, "default");
frm.change_custom_button_type("Update Clearance Date", null, "primary"); frm.change_custom_button_type("Update Clearance Date", null, "primary");
} }
=======
callback: function () {
frm.refresh();
>>>>>>> 6a06e26d04 (refactor: better UX on Bank Clearance tool)
}, },
}); });
}, },