nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 17:04:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-06-10 18:19:27 +05:30
committed by GitHub
parent 8156d89903
commit 60de0474a1
1 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1343,7 +1343,6 @@ 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,
@@ -1366,32 +1365,8 @@ def get_material_request_items(
"sales_order": sales_order, "sales_order": sales_order,
"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"),
"main_bom_item": row.get("main_bom_item"),
} }
=======
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):