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

fix: include company in filter condition

Browse Source
This commit is contained in:
venkat102
2024-12-30 14:18:55 +05:30
parent 1a7b09e576
commit b92f8bc514
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/queries.py
View File

@@ -276,11 +276,15 @@ def get_project_name(doctype, txt, searchfield, start, page_len, filters):
qb_filter_or_conditions = [] qb_filter_or_conditions = []
ifelse = CustomFunction("IF", ["condition", "then", "else"]) ifelse = CustomFunction("IF", ["condition", "then", "else"])
if filters and filters.get("customer"): if filters:
if filters.get("customer"):
qb_filter_and_conditions.append( qb_filter_and_conditions.append(
(proj.customer == filters.get("customer")) | proj.customer.isnull() | proj.customer == "" (proj.customer == filters.get("customer")) | proj.customer.isnull() | proj.customer == ""
) )
if filters.get("company"):
qb_filter_and_conditions.append(proj.company == filters.get("company"))
qb_filter_and_conditions.append(proj.status.notin(["Completed", "Cancelled"])) qb_filter_and_conditions.append(proj.status.notin(["Completed", "Cancelled"]))
q = qb.from_(proj) q = qb.from_(proj)