[enhance] introduce ignore_fields param for _tree and get_query
diff --git a/erpnext/accounts/doctype/account/account_tree.js b/erpnext/accounts/doctype/account/account_tree.js
index 8aee1ba..e63c797 100644
--- a/erpnext/accounts/doctype/account/account_tree.js
+++ b/erpnext/accounts/doctype/account/account_tree.js
@@ -1,3 +1,5 @@
+frappe.provide("frappe.treeview_settings")
+
frappe.treeview_settings["Account"] = {
breadcrumbs: "Accounts",
title: __("Chart Of Accounts"),
@@ -33,10 +35,19 @@
{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'),
depends_on: 'eval:doc.is_group==1&&doc.account_type=="Tax"'},
{fieldtype:'Link', fieldname:'warehouse', label:__('Warehouse'), options:"Warehouse",
- depends_on: 'eval:(!doc.is_group&&doc.account_type=="Warehouse")'},
+ depends_on: 'eval:(!doc.is_group&&doc.account_type=="Stock")',
+ get_query: function() {
+ return {
+ filters:{
+ "company": frappe.treeview_settings.filters["company"]
+ }
+ }
+ }
+ },
{fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency",
description: __("Optional. Sets company's default currency, if not specified.")}
],
+ ignore_fields:["parent_account"],
onrender: function(node) {
var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr";
if (node.data && node.data.balance!==undefined) {
diff --git a/erpnext/accounts/doctype/cost_center/cost_center_tree.js b/erpnext/accounts/doctype/cost_center/cost_center_tree.js
index 8c049d0..6eab34f 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center_tree.js
+++ b/erpnext/accounts/doctype/cost_center/cost_center_tree.js
@@ -23,4 +23,5 @@
{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
description:__('Further cost centers can be made under Groups but entries can be made against non-Groups')}
],
+ ignore_fields:["parent_cost_center"]
}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/customer_group/customer_group_tree.js b/erpnext/setup/doctype/customer_group/customer_group_tree.js
new file mode 100644
index 0000000..b52c79c
--- /dev/null
+++ b/erpnext/setup/doctype/customer_group/customer_group_tree.js
@@ -0,0 +1,3 @@
+frappe.treeview_settings["Customer Group"] = {
+ ignore_fields:["parent_customer_group"]
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/item_group/item_group_tree.js b/erpnext/setup/doctype/item_group/item_group_tree.js
new file mode 100644
index 0000000..57afe02
--- /dev/null
+++ b/erpnext/setup/doctype/item_group/item_group_tree.js
@@ -0,0 +1,3 @@
+frappe.treeview_settings["Item Group"] = {
+ ignore_fields:["parent_item_group"]
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/sales_person/sales_person_tree.js b/erpnext/setup/doctype/sales_person/sales_person_tree.js
index 38d4478..bcdfac9 100644
--- a/erpnext/setup/doctype/sales_person/sales_person_tree.js
+++ b/erpnext/setup/doctype/sales_person/sales_person_tree.js
@@ -1,3 +1,4 @@
+
frappe.treeview_settings["Sales Person"] = {
fields: [
{fieldtype:'Data', fieldname: 'sales_person_name',
diff --git a/erpnext/setup/doctype/territory/territory_tree.js b/erpnext/setup/doctype/territory/territory_tree.js
new file mode 100644
index 0000000..edd11df
--- /dev/null
+++ b/erpnext/setup/doctype/territory/territory_tree.js
@@ -0,0 +1,3 @@
+frappe.treeview_settings["Territory"] = {
+ ignore_fields:["parent_territory"]
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/warehouse/warehouse_tree.js b/erpnext/stock/doctype/warehouse/warehouse_tree.js
index 0b8106b..b0c0cbd 100644
--- a/erpnext/stock/doctype/warehouse/warehouse_tree.js
+++ b/erpnext/stock/doctype/warehouse/warehouse_tree.js
@@ -16,6 +16,7 @@
{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
description: __("Child nodes can be only created under 'Group' type nodes")}
],
+ ignore_fields:["parent_warehouse"],
onrender: function(node) {
if (node.data && node.data.balance!==undefined) {
$('<span class="balance-area pull-right text-muted small">'