nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 03:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove item name to avoid overriding item row name

Browse Source 
(cherry picked from commit 47055901c0)

# Conflicts:
#	erpnext/stock/doctype/pick_list/pick_list.py
This commit is contained in:
Kavin
2025-09-25 18:05:21 +05:30
committed by Mergify
parent 14e92d589f
commit cc94b9f090
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/stock/doctype/pick_list/pick_list.py
View File

@@ -1097,6 +1097,7 @@ def get_pending_work_orders(doctype, txt, searchfield, start, page_length, filte
@frappe.whitelist() @frappe.whitelist()
<<<<<<< HEAD
def target_document_exists(pick_list_name, purpose): def target_document_exists(pick_list_name, purpose):
if purpose == "Delivery": if purpose == "Delivery":
return frappe.db.exists("Delivery Note", {"pick_list": pick_list_name}) return frappe.db.exists("Delivery Note", {"pick_list": pick_list_name})
@@ -1107,6 +1108,10 @@ def target_document_exists(pick_list_name, purpose):
@frappe.whitelist() @frappe.whitelist()
def get_item_details(item_code, uom=None): def get_item_details(item_code, uom=None):
details = frappe.db.get_value("Item", item_code, ["stock_uom", "name"], as_dict=1) details = frappe.db.get_value("Item", item_code, ["stock_uom", "name"], as_dict=1)
=======
def get_item_details(item_code, uom=None, warehouse=None, company=None):
details = frappe.db.get_value("Item", item_code, "stock_uom", as_dict=1)
>>>>>>> 47055901c0 (fix: remove item name to avoid overriding item row name)
details.uom = uom or details.stock_uom details.uom = uom or details.stock_uom
if uom: if uom:
details.update(get_conversion_factor(item_code, uom)) details.update(get_conversion_factor(item_code, uom))