nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-12 17:51:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Move Employee inclusion to SQL level to preserve search semantics

Browse Source
This commit is contained in:
Assem Bahnasy
2025-08-11 12:41:34 +03:00
parent a08c7f37d3
commit 8a9bf166c6
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/setup/doctype/party_type/party_type.py
View File

@@ -31,7 +31,11 @@ def get_party_type(doctype, txt, searchfield, start, page_len, filters):
if filters and filters.get("account"): if filters and filters.get("account"):
account_type = frappe.db.get_value("Account", filters.get("account"), "account_type") account_type = frappe.db.get_value("Account", filters.get("account"), "account_type")
if account_type: if account_type:
cond = "and account_type = %(account_type)s" if account_type in ["Receivable", "Payable"]:
# Include Employee regardless of its configured account_type, but still respect the text filter
cond = "and (account_type = %(account_type)s or name = 'Employee')"
else:
cond = "and account_type = %(account_type)s"
# Build parameters dictionary # Build parameters dictionary
params = {"txt": "%" + txt + "%", "start": start, "page_len": page_len} params = {"txt": "%" + txt + "%", "start": start, "page_len": page_len}
@@ -45,12 +49,4 @@ def get_party_type(doctype, txt, searchfield, start, page_len, filters):
params, params,
) )
# Convert to list and append Employee if not already present return result or []
result = list(result) if result else []
# Only append Employee for Receivable or Payable account types
if account_type in ["Receivable", "Payable"]:
if not any(row[0] == "Employee" for row in result):
result.append(("Employee",)) # Using tuple format like SQL returns
return result