RobbyV2/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2025-12-03 18:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50864 from aerele/allow-leaf-nodes-only

Browse Source
This commit is contained in:
Diptanil Saha
2025-12-02 20:36:04 +05:30
committed by GitHub
parent 9f599ee52d e08805128b
commit f106d0e762
7 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/buying/doctype/supplier/supplier.js
View File

@@ -135,6 +135,14 @@ frappe.ui.form.on("Supplier", {
// indicators
erpnext.utils.set_party_dashboard_indicators(frm);
}
frm.set_query("supplier_group", () => {
return {
filters: {
is_group: 0,
},
};
});
},
get_supplier_group_details: function (frm) {
frappe.call({

16
erpnext/selling/doctype/customer/customer.js
View File

@@ -215,6 +215,22 @@ frappe.ui.form.on("Customer", {
var grid = cur_frm.get_field("sales_team").grid;
grid.set_column_disp("allocated_amount", false);
grid.set_column_disp("incentives", false);
frm.set_query("customer_group", () => {
return {
filters: {
is_group: 0,
},
};
});
frm.set_query("territory", () => {
return {
filters: {
is_group: 0,
},
};
});
},
validate: function (frm) {
if (frm.doc.lead_name) frappe.model.clear_doc("Lead", frm.doc.lead_name);

3
erpnext/setup/doctype/customer_group/customer_group.json
View File

@@ -140,7 +140,7 @@
"idx": 1,
"is_tree": 1,
"links": [],
"modified": "2025-01-22 10:48:10.186637",
"modified": "2025-12-02 13:58:03.378607",
"modified_by": "Administrator",
"module": "Setup",
"name": "Customer Group",
@@ -209,6 +209,7 @@
"share": 1
}
],
"row_format": "Dynamic",
"search_fields": "parent_customer_group",
"show_name_in_global_search": 1,
"sort_field": "creation",

3
erpnext/setup/doctype/item_group/item_group.json
View File

@@ -136,7 +136,7 @@
"is_tree": 1,
"links": [],
"max_attachments": 3,
"modified": "2025-01-22 10:46:09.450137",
"modified": "2025-12-02 13:58:30.018021",
"modified_by": "Administrator",
"module": "Setup",
"name": "Item Group",
@@ -203,6 +203,7 @@
"share": 1
}
],
"row_format": "Dynamic",
"search_fields": "parent_item_group",
"show_name_in_global_search": 1,
"sort_field": "creation",

4
erpnext/setup/doctype/supplier_group/supplier_group.json
View File

@@ -42,6 +42,7 @@
{
"bold": 1,
"default": "0",
"description": "Only leaf nodes are allowed in transaction",
"fieldname": "is_group",
"fieldtype": "Check",
"in_list_view": 1,
@@ -108,7 +109,7 @@
"idx": 1,
"is_tree": 1,
"links": [],
"modified": "2025-01-22 10:49:27.066443",
"modified": "2025-12-02 13:57:57.814686",
"modified_by": "Administrator",
"module": "Setup",
"name": "Supplier Group",
@@ -168,6 +169,7 @@
"share": 1
}
],
"row_format": "Dynamic",
"show_name_in_global_search": 1,
"sort_field": "creation",
"sort_order": "ASC",

4
erpnext/setup/doctype/territory/territory.json
View File

@@ -46,6 +46,7 @@
{
"bold": 1,
"default": "0",
"description": "Only leaf nodes are allowed in transaction",
"fieldname": "is_group",
"fieldtype": "Check",
"in_list_view": 1,
@@ -123,7 +124,7 @@
"idx": 1,
"is_tree": 1,
"links": [],
"modified": "2024-08-16 19:21:19.161490",
"modified": "2025-12-02 13:58:55.190485",
"modified_by": "Administrator",
"module": "Setup",
"name": "Territory",
@@ -184,6 +185,7 @@
"share": 1
}
],
"row_format": "Dynamic",
"search_fields": "parent_territory,territory_manager",
"show_name_in_global_search": 1,
"sort_field": "creation",

7
erpnext/stock/doctype/item/item.js
View File

@@ -232,6 +232,13 @@ frappe.ui.form.on("Item", {
});
frm.toggle_reqd("customer", frm.doc.is_customer_provided_item ? 1 : 0);
frm.set_query("item_group", () => {
return {
filters: {
is_group: 0,
},
};
});
},
validate: function (frm) {