From 17e6bb83eb79b51a6889cf1cafcdfc018786f267 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 20 Jun 2017 14:05:36 +0530 Subject: [PATCH] [fix] typo, item group route to have parent only for non root --- erpnext/public/js/shopping_cart.js | 4 ++-- erpnext/setup/doctype/item_group/item_group.py | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/erpnext/public/js/shopping_cart.js b/erpnext/public/js/shopping_cart.js index 01a899c0ec..e4e7440ebb 100644 --- a/erpnext/public/js/shopping_cart.js +++ b/erpnext/public/js/shopping_cart.js @@ -35,8 +35,8 @@ $.extend(shopping_cart, { }); }, - update_cart: function(opts) { - if(fraappe.session.user==="Guest") { + update_cart: function(opts) { + if(frappe.session.user==="Guest") { if(localStorage) { localStorage.setItem("last_visited", window.location.pathname); } diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py index 59a36debd3..9c2a4002a1 100644 --- a/erpnext/setup/doctype/item_group/item_group.py +++ b/erpnext/setup/doctype/item_group/item_group.py @@ -37,10 +37,11 @@ class ItemGroup(NestedSet, WebsiteGenerator): if not self.route: self.route = '' if self.parent_item_group: - parent_route = frappe.get_doc('Item Group', self.parent_item_group).route + parent_item_group = frappe.get_doc('Item Group', self.parent_item_group) - if parent_route: - self.route = parent_route + '/' + # make parent route only if not root + if parent_item_group.parent_item_group and parent_item_group.route: + self.route = parent_item_group.route + '/' self.route += self.scrub(self.item_group_name)