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

Merge pull request #1858 from nabinhait/v4-hotfix

Browse Source 
with_doc issue fixes
This commit is contained in:
Anand Doshi 2014-06-26 16:16:35 +05:30
commit 4105f324f7
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/manufacturing/doctype/bom/bom.js
View File

@ -62,7 +62,7 @@ cur_frm.add_fetch("item", "stock_uom", "uom");
cur_frm.cscript.workstation = function(doc,dt,dn) {
var d = locals[dt][dn];
frappe.model.with_doc("Workstation", d.workstation, function(i, r) {
frappe.model.with_doc("Workstation", d.workstation, function(name, r) {
d.hour_rate = r.docs[0].hour_rate;
refresh_field("hour_rate", dn, "bom_operations");
erpnext.bom.calculate_op_cost(doc);

14
erpnext/stock/doctype/item/item.js
View File

@ -169,14 +169,12 @@ cur_frm.fields_dict.item_supplier_details.grid.get_field("supplier").get_query =
}
cur_frm.cscript.copy_from_item_group = function(doc) {
frappe.model.with_doc("Item Group", doc.item_group, function() {
$.each((doc.item_website_specifications || []), function(i, d) {
var n = frappe.model.add_child(doc, "Item Website Specification",
"item_website_specifications");
n.label = d.label;
n.description = d.description;
}
);
frappe.model.with_doc("Item Group", doc.item_group, function(name, r) {
$.each((r.docs[0].item_website_specifications || []), function(i, d) {
var n = frappe.model.add_child(doc, "Item Website Specification", "item_website_specifications");
n.label = d.label;
n.description = d.description;
});
cur_frm.refresh();
});
}