From f411aede262328dc56d2ebe23ce72bb324fe265c Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Thu, 18 Jul 2024 20:56:56 +0200 Subject: [PATCH 1/3] fix(Supplier Group): properly call frm.set_read_only() --- erpnext/setup/doctype/supplier_group/supplier_group.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/doctype/supplier_group/supplier_group.js b/erpnext/setup/doctype/supplier_group/supplier_group.js index d720b3bd50..ec520d61ad 100644 --- a/erpnext/setup/doctype/supplier_group/supplier_group.js +++ b/erpnext/setup/doctype/supplier_group/supplier_group.js @@ -40,7 +40,7 @@ frappe.ui.form.on("Supplier Group", { }, set_root_readonly: function (frm) { if (!frm.doc.parent_supplier_group && !frm.doc.__islocal) { - frm.trigger("set_read_only"); + frm.set_read_only(); frm.set_intro(__("This is a root supplier group and cannot be edited.")); } else { frm.set_intro(null); -- GitLab From e7f305c66face9c31a26872c9a44a801ec5ce932 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Thu, 18 Jul 2024 20:59:26 +0200 Subject: [PATCH 2/3] fix(Supplier Group): remove useless headline Not sure what it was supposed to mean. It was only visible on root group, along with the other message. --- erpnext/setup/doctype/supplier_group/supplier_group.js | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/setup/doctype/supplier_group/supplier_group.js b/erpnext/setup/doctype/supplier_group/supplier_group.js index ec520d61ad..8f970e0b30 100644 --- a/erpnext/setup/doctype/supplier_group/supplier_group.js +++ b/erpnext/setup/doctype/supplier_group/supplier_group.js @@ -35,7 +35,6 @@ frappe.ui.form.on("Supplier Group", { }); }, refresh: function (frm) { - frm.set_intro(frm.doc.__islocal ? "" : __("There is nothing to edit.")); frm.trigger("set_root_readonly"); }, set_root_readonly: function (frm) { -- GitLab From 5d553a2e7ede3043abb862523f4a96b827eff285 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Thu, 18 Jul 2024 21:00:42 +0200 Subject: [PATCH 3/3] refactor(Supplier Group): use frm.is_new() instead of frm.doc.__islocal --- erpnext/setup/doctype/supplier_group/supplier_group.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/doctype/supplier_group/supplier_group.js b/erpnext/setup/doctype/supplier_group/supplier_group.js index 8f970e0b30..017cdd14c5 100644 --- a/erpnext/setup/doctype/supplier_group/supplier_group.js +++ b/erpnext/setup/doctype/supplier_group/supplier_group.js @@ -38,7 +38,7 @@ frappe.ui.form.on("Supplier Group", { frm.trigger("set_root_readonly"); }, set_root_readonly: function (frm) { - if (!frm.doc.parent_supplier_group && !frm.doc.__islocal) { + if (!frm.doc.parent_supplier_group && !frm.is_new()) { frm.set_read_only(); frm.set_intro(__("This is a root supplier group and cannot be edited.")); } else { -- GitLab