nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(stock): use purchase UOM in Supplier Quotation items

Browse Source 
(cherry picked from commit 2606ca6fa9)

# Conflicts:
#	erpnext/stock/get_item_details.py
This commit is contained in:
Bharathidhasan06
2026-01-22 18:07:36 +05:30
committed by Mergify
parent 0e3d276348
commit 69e0c56785
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/stock/get_item_details.py
View File

@@ -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 # 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 not args.get("uom"):
if args.get("doctype") in sales_doctypes: if args.get("doctype") in sales_doctypes:
args.uom = item.sales_uom if item.sales_uom else item.stock_uom 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 ( elif (args.get("doctype") in ["Purchase Order", "Purchase Receipt", "Purchase Invoice"]) or (
args.get("doctype") == "Material Request" and args.get("material_request_type") == "Purchase" 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 args.uom = item.purchase_uom if item.purchase_uom else item.stock_uom
else: else: