diff --git a/erpnext/buying/page/purchase_analytics/purchase_analytics.js b/erpnext/buying/page/purchase_analytics/purchase_analytics.js index df5790e826f..b5031138370 100644 --- a/erpnext/buying/page/purchase_analytics/purchase_analytics.js +++ b/erpnext/buying/page/purchase_analytics/purchase_analytics.js @@ -110,19 +110,7 @@ erpnext.PurchaseAnalytics = frappe.views.TreeGridReport.extend({ var me = this; if (!this.tl) { // add 'Not Set' Supplier & Item - // Add 'All Supplier Groups' Supplier Group // (Supplier / Item are not mandatory!!) - // Set parent supplier group for tree view - - $.each(frappe.report_dump.data["Supplier Group"], function(i, v) { - v['parent_supplier_group'] = __("All Supplier Groups") - }) - - frappe.report_dump.data["Supplier Group"] = [{ - name: __("All Supplier Groups"), - id: "All Supplier Groups", - }].concat(frappe.report_dump.data["Supplier Group"]); - frappe.report_dump.data["Supplier"].push({ name: __("Not Set"), parent_supplier_group: __("All Supplier Groups"), diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py index 2c294af2a1a..c686ed30803 100644 --- a/erpnext/setup/setup_wizard/operations/install_fixtures.py +++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py @@ -148,13 +148,14 @@ def install(country=None): {'doctype': 'Customer Group', 'customer_group_name': _('Government'), 'is_group': 0, 'parent_customer_group': _('All Customer Groups')}, # supplier group - {'doctype': 'Supplier Group', 'supplier_group_name': _('Services')}, - {'doctype': 'Supplier Group', 'supplier_group_name': _('Local')}, - {'doctype': 'Supplier Group', 'supplier_group_name': _('Raw Material')}, - {'doctype': 'Supplier Group', 'supplier_group_name': _('Electrical')}, - {'doctype': 'Supplier Group', 'supplier_group_name': _('Hardware')}, - {'doctype': 'Supplier Group', 'supplier_group_name': _('Pharmaceutical')}, - {'doctype': 'Supplier Group', 'supplier_group_name': _('Distributor')}, + {'doctype': 'Supplier Group', 'supplier_group_name': _('All Supplier Groups'), 'is_group': 1, 'name': _('All Supplier Groups'), 'parent_supplier_group': ''}, + {'doctype': 'Supplier Group', 'supplier_group_name': _('Services'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')}, + {'doctype': 'Supplier Group', 'supplier_group_name': _('Local'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')}, + {'doctype': 'Supplier Group', 'supplier_group_name': _('Raw Material'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')}, + {'doctype': 'Supplier Group', 'supplier_group_name': _('Electrical'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')}, + {'doctype': 'Supplier Group', 'supplier_group_name': _('Hardware'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')}, + {'doctype': 'Supplier Group', 'supplier_group_name': _('Pharmaceutical'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')}, + {'doctype': 'Supplier Group', 'supplier_group_name': _('Distributor'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')}, # Sales Person {'doctype': 'Sales Person', 'sales_person_name': _('Sales Team'), 'is_group': 1, "parent_sales_person": ""}, diff --git a/erpnext/startup/report_data_map.py b/erpnext/startup/report_data_map.py index 37200178047..5de7998c7d4 100644 --- a/erpnext/startup/report_data_map.py +++ b/erpnext/startup/report_data_map.py @@ -216,7 +216,7 @@ data_map = { } }, "Supplier Group": { - "columns": ["name"], + "columns": ["name", "parent_supplier_group"], "conditions": ["docstatus < 2"], "order_by": "name" },