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

Merge pull request #49095 from frappe/mergify/bp/version-15-hotfix/pr-49088

Browse Source 
fix: Include Employee party type in Receivable and Payable account filters (backport #49088)
This commit is contained in:
Asmita Hase
2025-08-11 17:01:48 +05:30
committed by GitHub
parent 0cd9330e44 e762007e0e
commit 6de74697c9
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,13 +26,27 @@ class PartyType(Document):
@frappe.validate_and_sanitize_search_inputs @frappe.validate_and_sanitize_search_inputs
def get_party_type(doctype, txt, searchfield, start, page_len, filters): def get_party_type(doctype, txt, searchfield, start, page_len, filters):
cond = "" cond = ""
account_type = None
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")
cond = "and account_type = '%s'" % account_type if account_type:
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"
return frappe.db.sql( # Build parameters dictionary
params = {"txt": "%" + txt + "%", "start": start, "page_len": page_len}
if account_type:
params["account_type"] = account_type
result = frappe.db.sql(
f"""select name from `tabParty Type` f"""select name from `tabParty Type`
where `{searchfield}` LIKE %(txt)s {cond} where `{searchfield}` LIKE %(txt)s {cond}
order by name limit %(page_len)s offset %(start)s""", order by name limit %(page_len)s offset %(start)s""",
{"txt": "%" + txt + "%", "start": start, "page_len": page_len}, params,
) )
return result or []