From 2ed8f8f099fb1a1bca6de7bfa23f474cbbd9dec7 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 17 Mar 2016 15:55:40 +0530 Subject: [PATCH] [fix] BOM Browser --- erpnext/manufacturing/page/bom_browser/bom_browser.js | 7 +++---- erpnext/manufacturing/page/bom_browser/bom_browser.py | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/erpnext/manufacturing/page/bom_browser/bom_browser.js b/erpnext/manufacturing/page/bom_browser/bom_browser.js index 453d8c57a9..3c13905caf 100644 --- a/erpnext/manufacturing/page/bom_browser/bom_browser.js +++ b/erpnext/manufacturing/page/bom_browser/bom_browser.js @@ -60,7 +60,6 @@ erpnext.BOMTree = Class.extend({ frappe.boot.user.in_create.indexOf("BOM") !== -1; me.can_write = frappe.model.can_write("BOM"); me.can_delete = frappe.model.can_delete("BOM"); - this.tree = new frappe.ui.Tree({ parent: $(parent), label: me.bom, @@ -74,15 +73,15 @@ erpnext.BOMTree = Class.extend({ return node.expandable; }, click: function(node) { - frappe.set_route("Form", "BOM", node.data.parent); + frappe.set_route("Form", "BOM", node.data.value); } } ], get_label: function(node) { if(node.data.qty) { - return node.data.qty + " x " + node.data.value; + return node.data.qty + " x " + node.data.item_code; } else { - return node.data.value; + return node.data.item_code || node.data.value; } } }); diff --git a/erpnext/manufacturing/page/bom_browser/bom_browser.py b/erpnext/manufacturing/page/bom_browser/bom_browser.py index 8051e69b9d..80993897a9 100644 --- a/erpnext/manufacturing/page/bom_browser/bom_browser.py +++ b/erpnext/manufacturing/page/bom_browser/bom_browser.py @@ -6,8 +6,8 @@ import frappe @frappe.whitelist() def get_children(parent): - return frappe.db.sql("""select item_code as value, - bom_no as parent, qty, + return frappe.db.sql("""select item_code, + bom_no as value, qty, if(ifnull(bom_no, "")!="", 1, 0) as expandable from `tabBOM Item` where parent=%s