diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index b0ade4324fa..2642bca0b7a 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -418,11 +418,21 @@ def get_basic_details(args, item, overwrite_warehouse=True):
 		)
 
 	# Set the UOM to the Default Sales UOM or Default Purchase UOM if configured in the Item Master
+<<<<<<< HEAD
 	if not args.get("uom"):
 		if args.get("doctype") in sales_doctypes:
 			args.uom = item.sales_uom if item.sales_uom else item.stock_uom
 		elif (args.get("doctype") in ["Purchase Order", "Purchase Receipt", "Purchase Invoice"]) or (
 			args.get("doctype") == "Material Request" and args.get("material_request_type") == "Purchase"
+=======
+	if not ctx.uom:
+		if ctx.doctype in sales_doctypes:
+			ctx.uom = item.sales_uom if item.sales_uom else item.stock_uom
+		elif (
+			(ctx.doctype in ["Purchase Order", "Purchase Receipt", "Purchase Invoice"])
+			or (ctx.doctype == "Material Request" and ctx.material_request_type == "Purchase")
+			or (ctx.doctype == "Supplier Quotation")
+>>>>>>> 2606ca6fa9 (fix(stock): use purchase UOM in Supplier Quotation items)
 		):
 			args.uom = item.purchase_uom if item.purchase_uom else item.stock_uom
 		else: