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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi 2012-12-24 19:51:57 +05:30
commit 815f2f32c8
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manufacturing/doctype/production_order/production_order.js
View File

@ -91,7 +91,7 @@ cur_frm.cscript.make_se = function(doc, purpose) {
se.company = doc.company; se.company = doc.company;
se.fg_completed_qty = doc.qty - doc.produced_qty; se.fg_completed_qty = doc.qty - doc.produced_qty;
se.bom_no = doc.bom_no; se.bom_no = doc.bom_no;
se.use_multi_level_bom = 1; se.use_multi_level_bom = doc.use_multi_level_bom;
loaddoc('Stock Entry', se.name); loaddoc('Stock Entry', se.name);
} }

10
manufacturing/doctype/production_order/production_order.txt
View File

@ -4,7 +4,7 @@
"docstatus": 0, "docstatus": 0,
"creation": "2012-12-20 14:31:18", "creation": "2012-12-20 14:31:18",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-12-20 15:50:43" "modified": "2012-12-24 18:39:00"
}, },
{ {
"is_submittable": 1, "is_submittable": 1,
@ -142,6 +142,14 @@
"fieldtype": "Data", "fieldtype": "Data",
"depends_on": "production_item" "depends_on": "production_item"
}, },
{
"description": "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",
"default": "1",
"doctype": "DocField",
"label": "Use Multi-Level BOM",
"fieldname": "use_multi_level_bom",
"fieldtype": "Check"
},
{ {
"read_only": 0, "read_only": 0,
"doctype": "DocField", "doctype": "DocField",

3
patches/november_2012/production_order_patch.py
View File

@ -7,3 +7,6 @@ def execute():
webnotes.conn.sql("""update `tabStock Entry` webnotes.conn.sql("""update `tabStock Entry`
set use_multi_level_bom = if(consider_sa_items_as_raw_materials='Yes', 0, 1)""") set use_multi_level_bom = if(consider_sa_items_as_raw_materials='Yes', 0, 1)""")
webnotes.conn.sql("""update `tabProduction Order`
set use_multi_level_bom = if(consider_sa_items_as_raw_materials='Yes', 0, 1)
where use_multi_level_bom is null""")

2
stock/doctype/stock_entry/stock_entry.py
View File

@ -543,6 +543,6 @@ class DocType(TransactionBase):
@webnotes.whitelist() @webnotes.whitelist()
def get_production_order_details(production_order): def get_production_order_details(production_order):
result = webnotes.conn.sql("""select bom_no, result = webnotes.conn.sql("""select bom_no,
ifnull(qty, 0) - ifnull(produced_qty, 0) as fg_completed_qty ifnull(qty, 0) - ifnull(produced_qty, 0) as fg_completed_qty, use_multi_level_bom
from `tabProduction Order` where name = %s""", production_order, as_dict=1) from `tabProduction Order` where name = %s""", production_order, as_dict=1)
return result and result[0] or {} return result and result[0] or {}