Note: This is Cost Center is a Group, \ + intro_txt += '
Note: This Cost Center is a Group, \ Accounting Entries are not allowed against groups.
'; } diff --git a/selling/page/sales_browser/sales_browser.js b/selling/page/sales_browser/sales_browser.js index ce495dbebd5..be43e677837 100644 --- a/selling/page/sales_browser/sales_browser.js +++ b/selling/page/sales_browser/sales_browser.js @@ -24,7 +24,14 @@ pscript['onload_Sales Browser'] = function(wrapper){ wrapper.make_tree = function() { var ctype = wn.get_route()[1] || 'Territory'; - erpnext.sales_chart = new erpnext.SalesChart(ctype, wrapper); + wn.call({ + method: 'selling.page.sales_browser.sales_browser.get_children', + args: {ctype: ctype}, + callback: function(r) { + var root = r.message[0]["value"]; + erpnext.sales_chart = new erpnext.SalesChart(ctype, root, wrapper); + } + }); } wrapper.make_tree(); @@ -42,20 +49,13 @@ pscript['onshow_Sales Browser'] = function(wrapper){ }; erpnext.SalesChart = Class.extend({ - init: function(ctype, wrapper) { - var root_nodes = { - 'Territory': 'All Territories', - 'Item Group': 'All Item Groups', - 'Customer Group': 'All Customer Groups', - 'Sales Person': 'All Sales Persons' - } - + init: function(ctype, root, wrapper) { $(wrapper).find('.tree-area').empty(); var me = this; me.ctype = ctype; this.tree = new wn.ui.Tree({ parent: $(wrapper).find('.tree-area'), - label: root_nodes[ctype], + label: root, args: {ctype: ctype}, method: 'selling.page.sales_browser.sales_browser.get_children', click: function(link) { @@ -72,7 +72,7 @@ erpnext.SalesChart = Class.extend({ } }); this.tree.rootnode.$a - .data('node-data', {value: root_nodes[ctype], expandable:1}) + .data('node-data', {value: root, expandable:1}) .click(); }, make_link_toolbar: function(link) { diff --git a/selling/page/sales_browser/sales_browser.py b/selling/page/sales_browser/sales_browser.py index 92c75e0fcdb..49a05ff5785 100644 --- a/selling/page/sales_browser/sales_browser.py +++ b/selling/page/sales_browser/sales_browser.py @@ -1,11 +1,14 @@ from __future__ import unicode_literals import webnotes + @webnotes.whitelist() def get_children(): ctype = webnotes.form_dict.get('ctype') webnotes.form_dict['parent_field'] = 'parent_' + ctype.lower().replace(' ', '_') - + if not webnotes.form_dict.get('parent'): + webnotes.form_dict['parent'] = '' + return webnotes.conn.sql("""select name as value, if(is_group='Yes', 1, 0) as expandable from `tab%(ctype)s` diff --git a/setup/doctype/customer_group/customer_group.js b/setup/doctype/customer_group/customer_group.js index 2b24c11efec..af0c6f0b44b 100644 --- a/setup/doctype/customer_group/customer_group.js +++ b/setup/doctype/customer_group/customer_group.js @@ -20,7 +20,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.cscript.set_root_readonly = function(doc) { // read-only for root customer group - if(doc.name==='All Customer Groups') { + if(!doc.parent_customer_group) { cur_frm.perm = [[1,0,0], [1,0,0]]; cur_frm.set_intro("This is a root customer group and cannot be edited."); } else { diff --git a/setup/doctype/customer_group/customer_group.py b/setup/doctype/customer_group/customer_group.py index 0f68521198b..cf126b8c07e 100644 --- a/setup/doctype/customer_group/customer_group.py +++ b/setup/doctype/customer_group/customer_group.py @@ -31,20 +31,29 @@ class DocType(DocTypeNestedSet): self.nsm_parent_field = 'parent_customer_group'; def validate(self): - if sql("select name from `tabCustomer Group` where name = %s and docstatus = 2", (self.doc.customer_group_name)): + if sql("select name from `tabCustomer Group` where name = %s and docstatus = 2", + (self.doc.customer_group_name)): msgprint("""Another %s record is trashed. - To untrash please go to Setup & click on Trash."""%(self.doc.customer_group_name), raise_exception = 1) - self.validate_root_details("All Customer Groups", "parent_customer_group") + To untrash please go to Setup -> Recycle Bin.""" % + (self.doc.customer_group_name), raise_exception = 1) + + super(DocType, self).validate() + def on_trash(self): - cust = sql("select name from `tabCustomer` where ifnull(customer_group, '') = %s", self.doc.name) + cust = sql("select name from `tabCustomer` where ifnull(customer_group, '') = %s", + self.doc.name) cust = [d[0] for d in cust] if cust: - msgprint("""Customer Group: %s can not be trashed/deleted because it is used in customer: %s. - To trash/delete this, remove/change customer group in customer master""" % (self.doc.name, cust or ''), raise_exception=1) + msgprint("""Customer Group: %s can not be trashed/deleted \ + because it is used in customer: %s. + To trash/delete this, remove/change customer group in customer master""" % + (self.doc.name, cust or ''), raise_exception=1) - if sql("select name from `tabCustomer Group` where parent_customer_group = %s and docstatus != 2", self.doc.name): - msgprint("Child customer group exists for this customer group. You can not trash/cancel/delete this customer group.", raise_exception=1) + if sql("select name from `tabCustomer Group` where parent_customer_group = %s \ + and docstatus != 2", self.doc.name): + msgprint("Child customer group exists for this customer group. \ + You can not trash/cancel/delete this customer group.", raise_exception=1) # rebuild tree - super(DocType, self).on_trash() + super(DocType, self).on_trash() \ No newline at end of file diff --git a/setup/doctype/item_group/item_group.js b/setup/doctype/item_group/item_group.js index 3869eec00bb..db894fa9d68 100644 --- a/setup/doctype/item_group/item_group.js +++ b/setup/doctype/item_group/item_group.js @@ -14,6 +14,21 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see