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

Merge branch 'creamdory-sort_bom_items' into develop

Browse Source
This commit is contained in:
Nabin Hait 2017-09-14 13:23:37 +05:30
commit beb2f3c415
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/manufacturing/doctype/bom/bom.py
View File

@ -531,19 +531,20 @@ def get_bom_items_as_dict(bom, company, qty=1, fetch_exploded=1, fetch_scrap_ite
and item.name = bom_item.item_code
and is_stock_item = 1
{where_conditions}
group by item_code, stock_uom"""
group by item_code, stock_uom
order by idx"""
if fetch_exploded:
query = query.format(table="BOM Explosion Item",
where_conditions="""and item.is_sub_contracted_item = 0""",
select_columns = ", bom_item.source_warehouse")
items = frappe.db.sql(query, { "qty": qty, "bom": bom }, as_dict=True)
select_columns = ", bom_item.source_warehouse, (Select idx from `tabBOM Item` where item_code = bom_item.item_code and parent = %(parent)s ) as idx")
items = frappe.db.sql(query, { "parent": bom, "qty": qty, "bom": bom }, as_dict=True)
elif fetch_scrap_items:
query = query.format(table="BOM Scrap Item", where_conditions="", select_columns="")
query = query.format(table="BOM Scrap Item", where_conditions="", select_columns=", bom_item.idx")
items = frappe.db.sql(query, { "qty": qty, "bom": bom }, as_dict=True)
else:
query = query.format(table="BOM Item", where_conditions="",
select_columns = ", bom_item.source_warehouse")
select_columns = ", bom_item.source_warehouse, bom_item.idx")
items = frappe.db.sql(query, { "qty": qty, "bom": bom }, as_dict=True)
for item in items:

2
erpnext/manufacturing/doctype/production_order/production_order.py
View File

@ -437,7 +437,7 @@ class ProductionOrder(Document):
item_dict = get_bom_items_as_dict(self.bom_no, self.company, qty=self.qty,
fetch_exploded = self.use_multi_level_bom)
for item in item_dict.values():
for item in sorted(item_dict.values(), key=lambda d: d['idx']):
self.append('required_items', {
'item_code': item.item_code,
'required_qty': item.qty,