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

chore: Remove redundant idx query and value setting

Browse Source 
- idx can be removed from `select_columns` as it is already in the main query
- setting idx to '' is not required as it is not used further
This commit is contained in:
marination 2022-03-28 21:00:00 +05:30
parent 40d7418dca
commit 639d380c1f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1025,7 +1025,7 @@ def get_bom_items_as_dict(
query = query.format( query = query.format(
table="BOM Scrap Item", table="BOM Scrap Item",
where_conditions="", where_conditions="",
select_columns=", bom_item.idx, item.description, is_process_loss", select_columns=", item.description, is_process_loss",
is_stock_item=is_stock_item, is_stock_item=is_stock_item,
qty_field="stock_qty", qty_field="stock_qty",
) )
@ -1038,7 +1038,7 @@ def get_bom_items_as_dict(
is_stock_item=is_stock_item, is_stock_item=is_stock_item,
qty_field="stock_qty" if fetch_qty_in_stock_uom else "qty", qty_field="stock_qty" if fetch_qty_in_stock_uom else "qty",
select_columns=""", bom_item.uom, bom_item.conversion_factor, bom_item.source_warehouse, select_columns=""", bom_item.uom, bom_item.conversion_factor, bom_item.source_warehouse,
bom_item.idx, bom_item.operation, bom_item.include_item_in_manufacturing, bom_item.sourced_by_supplier, bom_item.operation, bom_item.include_item_in_manufacturing, bom_item.sourced_by_supplier,
bom_item.description, bom_item.base_rate as rate """, bom_item.description, bom_item.base_rate as rate """,
) )
items = frappe.db.sql(query, {"qty": qty, "bom": bom, "company": company}, as_dict=True) items = frappe.db.sql(query, {"qty": qty, "bom": bom, "company": company}, as_dict=True)

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

@ -1382,7 +1382,6 @@ class StockEntry(StockController):
if self.purpose != "Send to Subcontractor" and self.purpose in ["Manufacture", "Repack"]: if self.purpose != "Send to Subcontractor" and self.purpose in ["Manufacture", "Repack"]:
scrap_item_dict = self.get_bom_scrap_material(self.fg_completed_qty) scrap_item_dict = self.get_bom_scrap_material(self.fg_completed_qty)
for item in scrap_item_dict.values(): for item in scrap_item_dict.values():
item.idx = ""
if self.pro_doc and self.pro_doc.scrap_warehouse: if self.pro_doc and self.pro_doc.scrap_warehouse:
item["to_warehouse"] = self.pro_doc.scrap_warehouse item["to_warehouse"] = self.pro_doc.scrap_warehouse