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

[grid] [bom] fixes erpnext #514, #515, wnframework #187

Browse Source
This commit is contained in:
Rushabh Mehta 2013-06-27 11:45:47 +05:30
parent e6d986adea
commit e5dfc6c440
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manufacturing/doctype/bom/bom.js
View File

@ -44,9 +44,9 @@ var set_operation_no = function(doc) {
var op = op_table[i].operation_no; var op = op_table[i].operation_no;
if (op && !inList(operations, op)) operations.push(op); if (op && !inList(operations, op)) operations.push(op);
} }
cur_frm.fields_dict["bom_materials"].grid.get_field("operation_no") wn.meta.get_docfield("BOM Item", "operation_no",
.df.options = operations.join("\n"); cur_frm.docname).options = operations.join("\n");
$.each(getchildren("BOM Item", doc.name, "bom_materials"), function(i, v) { $.each(getchildren("BOM Item", doc.name, "bom_materials"), function(i, v) {
if(!inList(operations, cstr(v.operation_no))) v.operation_no = null; if(!inList(operations, cstr(v.operation_no))) v.operation_no = null;

3
manufacturing/doctype/bom/bom.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-01-22 15:11:38", "creation": "2013-01-22 15:11:38",
"docstatus": 0, "docstatus": 0,
"modified": "2013-01-29 17:32:53", "modified": "2013-06-27 11:08:28",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -112,6 +112,7 @@
"options": "Specify the operations, operating cost and give a unique Operation no to your operations." "options": "Specify the operations, operating cost and give a unique Operation no to your operations."
}, },
{ {
"depends_on": "with_operations",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "bom_operations", "fieldname": "bom_operations",
"fieldtype": "Table", "fieldtype": "Table",

3
manufacturing/doctype/bom_item/bom_item.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-02-22 01:27:49", "creation": "2013-02-22 01:27:49",
"docstatus": 0, "docstatus": 0,
"modified": "2013-03-07 07:03:18", "modified": "2013-06-27 11:30:07",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -92,6 +92,7 @@
"reqd": 1 "reqd": 1
}, },
{ {
"description": "See \"Rate Of Materials Based On\" in Costing Section",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "rate", "fieldname": "rate",
"fieldtype": "Float", "fieldtype": "Float",