nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-09 16:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] Bom raw materials not in order in the stock entry (#12149)

Browse Source
This commit is contained in:
rohitwaghchaure
2017-12-25 11:26:40 +05:30
committed by Nabin Hait
parent 75789b65c2
commit d8c6449f3a
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -519,6 +519,7 @@ def get_bom_items_as_dict(bom, company, qty=1, fetch_exploded=1, fetch_scrap_ite
# Did not use qty_consumed_per_unit in the query, as it leads to rounding loss # Did not use qty_consumed_per_unit in the query, as it leads to rounding loss
query = """select query = """select
bom_item.item_code, bom_item.item_code,
bom_item.idx,
item.item_name, item.item_name,
sum(bom_item.stock_qty/ifnull(bom.quantity, 1)) * %(qty)s as qty, sum(bom_item.stock_qty/ifnull(bom.quantity, 1)) * %(qty)s as qty,
item.description, item.description,

3
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -775,6 +775,9 @@ class StockEntry(StockController):
se_child.expense_account = item_dict[d].get("expense_account") or expense_account se_child.expense_account = item_dict[d].get("expense_account") or expense_account
se_child.cost_center = item_dict[d].get("cost_center") or cost_center se_child.cost_center = item_dict[d].get("cost_center") or cost_center
if item_dict[d].get("idx"):
se_child.idx = item_dict[d].get("idx")
if se_child.s_warehouse==None: if se_child.s_warehouse==None:
se_child.s_warehouse = self.from_warehouse se_child.s_warehouse = self.from_warehouse
if se_child.t_warehouse==None: if se_child.t_warehouse==None: