nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-21 07:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: incorrect warehouse in MR

Browse Source 
(cherry picked from commit 2b9ca79291)

# Conflicts:
#	erpnext/manufacturing/doctype/production_plan/production_plan.py
This commit is contained in:
Rohit Waghchaure
2025-06-10 17:36:47 +05:30
committed by Mergify
parent 10e4e610db
commit 2cac05e56c
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
erpnext/manufacturing/doctype/production_plan/production_plan.py
View File

@@ -1115,6 +1115,7 @@ def get_subitems(
item_default.default_warehouse, item_default.default_warehouse,
item.purchase_uom, item.purchase_uom,
item_uom.conversion_factor, item_uom.conversion_factor,
bom.item.as_("main_bom_item"),
) )
.where( .where(
(bom.name == bom_no) (bom.name == bom_no)
@@ -1206,6 +1207,7 @@ def get_material_request_items(
get_conversion_factor(row.item_code, item_details.purchase_uom).get("conversion_factor") or 1.0 get_conversion_factor(row.item_code, item_details.purchase_uom).get("conversion_factor") or 1.0
) )
<<<<<<< HEAD
if required_qty > 0: if required_qty > 0:
return { return {
"item_code": row.item_code, "item_code": row.item_code,
@@ -1229,6 +1231,31 @@ def get_material_request_items(
"description": row.get("description"), "description": row.get("description"),
"uom": row.get("purchase_uom") or row.get("stock_uom"), "uom": row.get("purchase_uom") or row.get("stock_uom"),
} }
=======
return {
"item_code": row.item_code,
"item_name": row.item_name,
"quantity": required_qty / conversion_factor,
"conversion_factor": conversion_factor,
"required_bom_qty": total_qty,
"stock_uom": row.get("stock_uom"),
"warehouse": warehouse
or row.get("source_warehouse")
or row.get("default_warehouse")
or item_group_defaults.get("default_warehouse"),
"safety_stock": row.safety_stock,
"actual_qty": bin_dict.get("actual_qty", 0),
"projected_qty": bin_dict.get("projected_qty", 0),
"ordered_qty": bin_dict.get("ordered_qty", 0),
"reserved_qty_for_production": bin_dict.get("reserved_qty_for_production", 0),
"min_order_qty": row["min_order_qty"],
"material_request_type": row.get("default_material_request_type"),
"sales_order": sales_order,
"description": row.get("description"),
"uom": row.get("purchase_uom") or row.get("stock_uom"),
"main_bom_item": row.get("main_bom_item"),
}
>>>>>>> 2b9ca79291 (fix: incorrect warehouse in MR)
def get_sales_orders(self): def get_sales_orders(self):

7
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -1266,6 +1266,11 @@ def make_raw_material_request(items, company, sales_order, project=None):
items.update({"company": company, "sales_order": sales_order}) items.update({"company": company, "sales_order": sales_order})
item_wh = {}
for item in items.get("items"):
if item.get("warehouse"):
item_wh[item.get("item_code")] = item.get("warehouse")
raw_materials = get_items_for_material_requests(items) raw_materials = get_items_for_material_requests(items)
if not raw_materials: if not raw_materials:
frappe.msgprint(_("Material Request not created, as quantity for Raw Materials already available.")) frappe.msgprint(_("Material Request not created, as quantity for Raw Materials already available."))
@@ -1290,7 +1295,7 @@ def make_raw_material_request(items, company, sales_order, project=None):
"item_code": item.get("item_code"), "item_code": item.get("item_code"),
"qty": item.get("quantity"), "qty": item.get("quantity"),
"schedule_date": schedule_date, "schedule_date": schedule_date,
"warehouse": item.get("warehouse"), "warehouse": item_wh.get(item.get("main_bom_item")) or item.get("warehouse"),
"sales_order": sales_order, "sales_order": sales_order,
"project": project, "project": project,
}, },