schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-08-29 14:09:42 +05:30
parent 9afbd43f05
commit cfb5a6592c
1 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,17 +36,12 @@ frappe.ui.form.on("Bank Clearance", {
refresh: function (frm) { refresh: function (frm) {
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) { if (frm.doc.payment_entries.length) {
frm.add_custom_button(__("Update Clearance Date"), () => frm.trigger("update_clearance_date")); 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(__("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");
} }
>>>>>>> 6a06e26d04 (refactor: better UX on Bank Clearance tool)
}, },
update_clearance_date: function (frm) { update_clearance_date: function (frm) {
@@ -54,17 +49,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_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(); frm.refresh();
>>>>>>> 6a06e26d04 (refactor: better UX on Bank Clearance tool)
}, },
}); });
}, },
@@ -73,22 +58,8 @@ 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) {
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 () { callback: function () {
frm.refresh(); frm.refresh();
>>>>>>> 6a06e26d04 (refactor: better UX on Bank Clearance tool)
}, },
}); });
}, },