nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-12 19:35:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: exclude is_group records

Browse Source 
(cherry picked from commit e08805128b)

# Conflicts:
#	erpnext/setup/doctype/customer_group/customer_group.json
#	erpnext/setup/doctype/item_group/item_group.json
#	erpnext/setup/doctype/supplier_group/supplier_group.json
#	erpnext/setup/doctype/territory/territory.json
This commit is contained in:
ravibharathi656
2025-12-02 14:07:16 +05:30
committed by Mergify
parent 7640944bb9
commit a444325bd1
7 changed files with 81 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,6 +139,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

@@ -200,6 +200,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);

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

@@ -139,7 +139,11 @@
"idx": 1,
"is_tree": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-06-02 13:40:34.435822",
=======
"modified": "2025-12-02 13:58:03.378607",
>>>>>>> e08805128b (fix: exclude is_group records)
"modified_by": "Administrator",
"module": "Setup",
"name": "Customer Group",
@@ -208,9 +212,16 @@
"share": 1
}
],
"row_format": "Dynamic",
"search_fields": "parent_customer_group",
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "DESC",
<<<<<<< HEAD
"states": []
}
}
=======
"states": [],
"translated_doctype": 1
}
>>>>>>> e08805128b (fix: exclude is_group records)

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

@@ -135,7 +135,11 @@
"is_tree": 1,
"links": [],
"max_attachments": 3,
<<<<<<< HEAD
"modified": "2024-01-30 14:08:38.485616",
=======
"modified": "2025-12-02 13:58:30.018021",
>>>>>>> e08805128b (fix: exclude is_group records)
"modified_by": "Administrator",
"module": "Setup",
"name": "Item Group",
@@ -202,9 +206,16 @@
"share": 1
}
],
"row_format": "Dynamic",
"search_fields": "parent_item_group",
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "DESC",
<<<<<<< HEAD
"states": []
}
}
=======
"states": [],
"translated_doctype": 1
}
>>>>>>> e08805128b (fix: exclude is_group records)

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

@@ -41,6 +41,7 @@
{
"bold": 1,
"default": "0",
"description": "Only leaf nodes are allowed in transaction",
"fieldname": "is_group",
"fieldtype": "Check",
"in_list_view": 1,
@@ -107,7 +108,11 @@
"idx": 1,
"is_tree": 1,
"links": [],
<<<<<<< HEAD
"modified": "2022-12-24 11:16:12.486719",
=======
"modified": "2025-12-02 13:57:57.814686",
>>>>>>> e08805128b (fix: exclude is_group records)
"modified_by": "Administrator",
"module": "Setup",
"name": "Supplier Group",
@@ -168,8 +173,15 @@
"share": 1
}
],
"row_format": "Dynamic",
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "ASC",
<<<<<<< HEAD
"states": []
}
}
=======
"states": [],
"translated_doctype": 1
}
>>>>>>> e08805128b (fix: exclude is_group records)

14
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,11 @@
"idx": 1,
"is_tree": 1,
"links": [],
<<<<<<< HEAD
"modified": "2022-12-24 11:16:39.964956",
=======
"modified": "2025-12-02 13:58:55.190485",
>>>>>>> e08805128b (fix: exclude is_group records)
"modified_by": "Administrator",
"module": "Setup",
"name": "Territory",
@@ -186,9 +191,16 @@
"share": 1
}
],
"row_format": "Dynamic",
"search_fields": "parent_territory,territory_manager",
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "DESC",
<<<<<<< HEAD
"states": []
}
}
=======
"states": [],
"translated_doctype": 1
}
>>>>>>> e08805128b (fix: exclude is_group records)

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

@@ -226,6 +226,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) {