From 6b1d20970e79b33f94c16a78a301c77dedf1d136 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Wed, 5 Mar 2025 16:33:57 +0530 Subject: [PATCH] fix: uom reverts to default upon selecting do not explode (#45693) * fix: uom reverts to default upon selecting do not explode * fix: logical error failing tests (cherry picked from commit 58ed697ba5d36f6e44b858a36e347648129bb4fd) --- erpnext/manufacturing/doctype/bom/bom.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index 054b482b260..61f1de798e2 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -440,12 +440,12 @@ class BOM(WebsiteGenerator): "description": item and args["description"] or "", "image": item and args["image"] or "", "stock_uom": item and args["stock_uom"] or "", - "uom": item and args["stock_uom"] or "", - "conversion_factor": 1, + "uom": args["uom"] if hasattr(args, "uom") else item and args["stock_uom"] or "", + "conversion_factor": args["conversion_factor"] if hasattr(args, "conversion_factor") else 1, "bom_no": args["bom_no"], "rate": rate, "qty": args.get("qty") or args.get("stock_qty") or 1, - "stock_qty": args.get("qty") or args.get("stock_qty") or 1, + "stock_qty": args.get("stock_qty") or args.get("qty") or 1, "base_rate": flt(rate) * (flt(self.conversion_rate) or 1), "include_item_in_manufacturing": cint(args.get("transfer_for_manufacture")), "sourced_by_supplier": args.get("sourced_by_supplier", 0),