mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-01 12:38:27 +00:00
fix: exclude is_group records
(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:
@@ -139,6 +139,14 @@ frappe.ui.form.on("Supplier", {
|
|||||||
// indicators
|
// indicators
|
||||||
erpnext.utils.set_party_dashboard_indicators(frm);
|
erpnext.utils.set_party_dashboard_indicators(frm);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
frm.set_query("supplier_group", () => {
|
||||||
|
return {
|
||||||
|
filters: {
|
||||||
|
is_group: 0,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
});
|
||||||
},
|
},
|
||||||
get_supplier_group_details: function (frm) {
|
get_supplier_group_details: function (frm) {
|
||||||
frappe.call({
|
frappe.call({
|
||||||
|
|||||||
@@ -200,6 +200,22 @@ frappe.ui.form.on("Customer", {
|
|||||||
var grid = cur_frm.get_field("sales_team").grid;
|
var grid = cur_frm.get_field("sales_team").grid;
|
||||||
grid.set_column_disp("allocated_amount", false);
|
grid.set_column_disp("allocated_amount", false);
|
||||||
grid.set_column_disp("incentives", 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) {
|
validate: function (frm) {
|
||||||
if (frm.doc.lead_name) frappe.model.clear_doc("Lead", frm.doc.lead_name);
|
if (frm.doc.lead_name) frappe.model.clear_doc("Lead", frm.doc.lead_name);
|
||||||
|
|||||||
@@ -139,7 +139,11 @@
|
|||||||
"idx": 1,
|
"idx": 1,
|
||||||
"is_tree": 1,
|
"is_tree": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2023-06-02 13:40:34.435822",
|
"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",
|
"modified_by": "Administrator",
|
||||||
"module": "Setup",
|
"module": "Setup",
|
||||||
"name": "Customer Group",
|
"name": "Customer Group",
|
||||||
@@ -208,9 +212,16 @@
|
|||||||
"share": 1
|
"share": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"row_format": "Dynamic",
|
||||||
"search_fields": "parent_customer_group",
|
"search_fields": "parent_customer_group",
|
||||||
"show_name_in_global_search": 1,
|
"show_name_in_global_search": 1,
|
||||||
"sort_field": "modified",
|
"sort_field": "modified",
|
||||||
"sort_order": "DESC",
|
"sort_order": "DESC",
|
||||||
|
<<<<<<< HEAD
|
||||||
"states": []
|
"states": []
|
||||||
}
|
}
|
||||||
|
=======
|
||||||
|
"states": [],
|
||||||
|
"translated_doctype": 1
|
||||||
|
}
|
||||||
|
>>>>>>> e08805128b (fix: exclude is_group records)
|
||||||
|
|||||||
@@ -135,7 +135,11 @@
|
|||||||
"is_tree": 1,
|
"is_tree": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"max_attachments": 3,
|
"max_attachments": 3,
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2024-01-30 14:08:38.485616",
|
"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",
|
"modified_by": "Administrator",
|
||||||
"module": "Setup",
|
"module": "Setup",
|
||||||
"name": "Item Group",
|
"name": "Item Group",
|
||||||
@@ -202,9 +206,16 @@
|
|||||||
"share": 1
|
"share": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"row_format": "Dynamic",
|
||||||
"search_fields": "parent_item_group",
|
"search_fields": "parent_item_group",
|
||||||
"show_name_in_global_search": 1,
|
"show_name_in_global_search": 1,
|
||||||
"sort_field": "modified",
|
"sort_field": "modified",
|
||||||
"sort_order": "DESC",
|
"sort_order": "DESC",
|
||||||
|
<<<<<<< HEAD
|
||||||
"states": []
|
"states": []
|
||||||
}
|
}
|
||||||
|
=======
|
||||||
|
"states": [],
|
||||||
|
"translated_doctype": 1
|
||||||
|
}
|
||||||
|
>>>>>>> e08805128b (fix: exclude is_group records)
|
||||||
|
|||||||
@@ -41,6 +41,7 @@
|
|||||||
{
|
{
|
||||||
"bold": 1,
|
"bold": 1,
|
||||||
"default": "0",
|
"default": "0",
|
||||||
|
"description": "Only leaf nodes are allowed in transaction",
|
||||||
"fieldname": "is_group",
|
"fieldname": "is_group",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
@@ -107,7 +108,11 @@
|
|||||||
"idx": 1,
|
"idx": 1,
|
||||||
"is_tree": 1,
|
"is_tree": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2022-12-24 11:16:12.486719",
|
"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",
|
"modified_by": "Administrator",
|
||||||
"module": "Setup",
|
"module": "Setup",
|
||||||
"name": "Supplier Group",
|
"name": "Supplier Group",
|
||||||
@@ -168,8 +173,15 @@
|
|||||||
"share": 1
|
"share": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"row_format": "Dynamic",
|
||||||
"show_name_in_global_search": 1,
|
"show_name_in_global_search": 1,
|
||||||
"sort_field": "modified",
|
"sort_field": "modified",
|
||||||
"sort_order": "ASC",
|
"sort_order": "ASC",
|
||||||
|
<<<<<<< HEAD
|
||||||
"states": []
|
"states": []
|
||||||
}
|
}
|
||||||
|
=======
|
||||||
|
"states": [],
|
||||||
|
"translated_doctype": 1
|
||||||
|
}
|
||||||
|
>>>>>>> e08805128b (fix: exclude is_group records)
|
||||||
|
|||||||
@@ -46,6 +46,7 @@
|
|||||||
{
|
{
|
||||||
"bold": 1,
|
"bold": 1,
|
||||||
"default": "0",
|
"default": "0",
|
||||||
|
"description": "Only leaf nodes are allowed in transaction",
|
||||||
"fieldname": "is_group",
|
"fieldname": "is_group",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
@@ -123,7 +124,11 @@
|
|||||||
"idx": 1,
|
"idx": 1,
|
||||||
"is_tree": 1,
|
"is_tree": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2022-12-24 11:16:39.964956",
|
"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",
|
"modified_by": "Administrator",
|
||||||
"module": "Setup",
|
"module": "Setup",
|
||||||
"name": "Territory",
|
"name": "Territory",
|
||||||
@@ -186,9 +191,16 @@
|
|||||||
"share": 1
|
"share": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"row_format": "Dynamic",
|
||||||
"search_fields": "parent_territory,territory_manager",
|
"search_fields": "parent_territory,territory_manager",
|
||||||
"show_name_in_global_search": 1,
|
"show_name_in_global_search": 1,
|
||||||
"sort_field": "modified",
|
"sort_field": "modified",
|
||||||
"sort_order": "DESC",
|
"sort_order": "DESC",
|
||||||
|
<<<<<<< HEAD
|
||||||
"states": []
|
"states": []
|
||||||
}
|
}
|
||||||
|
=======
|
||||||
|
"states": [],
|
||||||
|
"translated_doctype": 1
|
||||||
|
}
|
||||||
|
>>>>>>> e08805128b (fix: exclude is_group records)
|
||||||
|
|||||||
@@ -226,6 +226,13 @@ frappe.ui.form.on("Item", {
|
|||||||
});
|
});
|
||||||
|
|
||||||
frm.toggle_reqd("customer", frm.doc.is_customer_provided_item ? 1 : 0);
|
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) {
|
validate: function (frm) {
|
||||||
|
|||||||
Reference in New Issue
Block a user