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

[fix] BOM Browser

Browse Source
This commit is contained in:
Nabin Hait 2016-03-17 15:55:40 +05:30
parent cf8fd6274d
commit 2ed8f8f099
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/manufacturing/page/bom_browser/bom_browser.js
View File

@ -60,7 +60,6 @@ erpnext.BOMTree = Class.extend({
frappe.boot.user.in_create.indexOf("BOM") !== -1; frappe.boot.user.in_create.indexOf("BOM") !== -1;
me.can_write = frappe.model.can_write("BOM"); me.can_write = frappe.model.can_write("BOM");
me.can_delete = frappe.model.can_delete("BOM"); me.can_delete = frappe.model.can_delete("BOM");
this.tree = new frappe.ui.Tree({ this.tree = new frappe.ui.Tree({
parent: $(parent), parent: $(parent),
label: me.bom, label: me.bom,
@ -74,15 +73,15 @@ erpnext.BOMTree = Class.extend({
return node.expandable; return node.expandable;
}, },
click: function(node) { click: function(node) {
frappe.set_route("Form", "BOM", node.data.parent); frappe.set_route("Form", "BOM", node.data.value);
} }
} }
], ],
get_label: function(node) { get_label: function(node) {
if(node.data.qty) { if(node.data.qty) {
return node.data.qty + " x " + node.data.value; return node.data.qty + " x " + node.data.item_code;
} else { } else {
return node.data.value; return node.data.item_code || node.data.value;
} }
} }
}); });

4
erpnext/manufacturing/page/bom_browser/bom_browser.py
View File

@ -6,8 +6,8 @@ import frappe
@frappe.whitelist() @frappe.whitelist()
def get_children(parent): def get_children(parent):
return frappe.db.sql("""select item_code as value, return frappe.db.sql("""select item_code,
bom_no as parent, qty, bom_no as value, qty,
if(ifnull(bom_no, "")!="", 1, 0) as expandable if(ifnull(bom_no, "")!="", 1, 0) as expandable
from `tabBOM Item` from `tabBOM Item`
where parent=%s where parent=%s