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

Merge pull request #49118 from sagarvora/rm-query-exists

Browse Source
This commit is contained in:
Sagar Vora
2025-08-12 11:19:39 +00:00
committed by GitHub
parent 81c8972a66 6bf63f66ec
commit 655a241958
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/setup/doctype/brand/brand.py
View File

@@ -35,7 +35,7 @@ def get_brand_defaults(item, company):
for d in brand.brand_defaults or []: for d in brand.brand_defaults or []:
if d.company == company: if d.company == company:
row = copy.deepcopy(d.as_dict()) row = d.as_dict(no_private_properties=True)
row.pop("name") row.pop("name")
return row return row

2
erpnext/setup/doctype/item_group/item_group.py
View File

@@ -90,7 +90,7 @@ def get_item_group_defaults(item, company):
for d in item_group.item_group_defaults or []: for d in item_group.item_group_defaults or []:
if d.company == company: if d.company == company:
row = copy.deepcopy(d.as_dict()) row = d.as_dict(no_private_properties=True)
row.pop("name") row.pop("name")
return row return row

2
erpnext/stock/doctype/item/item.py
View File

@@ -1277,7 +1277,7 @@ def get_item_defaults(item_code, company):
for d in item.item_defaults: for d in item.item_defaults:
if d.company == company: if d.company == company:
row = copy.deepcopy(d.as_dict()) row = d.as_dict(no_private_properties=True)
row.pop("name") row.pop("name")
out.update(row) out.update(row)
return out return out

13
erpnext/stock/get_item_details.py
View File

@@ -585,20 +585,15 @@ def get_item_warehouse_(ctx: ItemDetailsCtx, item, overwrite_warehouse, defaults
or ctx.warehouse or ctx.warehouse
) )
if not warehouse:
defaults = frappe.defaults.get_defaults() or {}
warehouse_exists = frappe.db.exists(
"Warehouse", {"name": defaults.default_warehouse, "company": ctx.company}
)
if defaults.get("default_warehouse") and warehouse_exists:
warehouse = defaults.default_warehouse
else: else:
warehouse = ctx.warehouse warehouse = ctx.warehouse
if not warehouse: if not warehouse:
default_warehouse = frappe.get_single_value("Stock Settings", "default_warehouse") default_warehouse = frappe.get_single_value("Stock Settings", "default_warehouse")
if frappe.db.get_value("Warehouse", default_warehouse, "company") == ctx.company: if (
default_warehouse
and frappe.get_cached_value("Warehouse", default_warehouse, "company") == ctx.company
):
return default_warehouse return default_warehouse
return warehouse return warehouse