Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added fixtures for supplier-group, changed analytics report accordingly

Browse Source
This commit is contained in:
Zlash65 2018-04-20 11:07:19 +05:30
parent c88ce364ce
commit 93d6b555d7
3 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/buying/page/purchase_analytics/purchase_analytics.js
View File

@ -110,19 +110,7 @@ erpnext.PurchaseAnalytics = frappe.views.TreeGridReport.extend({
var me = this; var me = this;
if (!this.tl) { if (!this.tl) {
// add 'Not Set' Supplier & Item // add 'Not Set' Supplier & Item
// Add 'All Supplier Groups' Supplier Group
// (Supplier / Item are not mandatory!!) // (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({ frappe.report_dump.data["Supplier"].push({
name: __("Not Set"), name: __("Not Set"),
parent_supplier_group: __("All Supplier Groups"), parent_supplier_group: __("All Supplier Groups"),

15
erpnext/setup/setup_wizard/operations/install_fixtures.py
View File

@ -148,13 +148,14 @@ def install(country=None):
{'doctype': 'Customer Group', 'customer_group_name': _('Government'), 'is_group': 0, 'parent_customer_group': _('All Customer Groups')}, {'doctype': 'Customer Group', 'customer_group_name': _('Government'), 'is_group': 0, 'parent_customer_group': _('All Customer Groups')},
# supplier group # supplier group
{'doctype': 'Supplier Group', 'supplier_group_name': _('Services')}, {'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': _('Local')}, {'doctype': 'Supplier Group', 'supplier_group_name': _('Services'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')},
{'doctype': 'Supplier Group', 'supplier_group_name': _('Raw Material')}, {'doctype': 'Supplier Group', 'supplier_group_name': _('Local'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')},
{'doctype': 'Supplier Group', 'supplier_group_name': _('Electrical')}, {'doctype': 'Supplier Group', 'supplier_group_name': _('Raw Material'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')},
{'doctype': 'Supplier Group', 'supplier_group_name': _('Hardware')}, {'doctype': 'Supplier Group', 'supplier_group_name': _('Electrical'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')},
{'doctype': 'Supplier Group', 'supplier_group_name': _('Pharmaceutical')}, {'doctype': 'Supplier Group', 'supplier_group_name': _('Hardware'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')},
{'doctype': 'Supplier Group', 'supplier_group_name': _('Distributor')}, {'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 # Sales Person
{'doctype': 'Sales Person', 'sales_person_name': _('Sales Team'), 'is_group': 1, "parent_sales_person": ""}, {'doctype': 'Sales Person', 'sales_person_name': _('Sales Team'), 'is_group': 1, "parent_sales_person": ""},

2
erpnext/startup/report_data_map.py
View File

@ -216,7 +216,7 @@ data_map = {
} }
}, },
"Supplier Group": { "Supplier Group": {
"columns": ["name"], "columns": ["name", "parent_supplier_group"],
"conditions": ["docstatus < 2"], "conditions": ["docstatus < 2"],
"order_by": "name" "order_by": "name"
}, },