mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-16 16:08:39 +00:00
fix(projects): include on hold status in project filters and reports
(cherry picked from commit 51a9fc0316)
This commit is contained in:
@@ -306,7 +306,9 @@ def bom(doctype, txt, searchfield, start, page_len, filters):
|
|||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
@frappe.validate_and_sanitize_search_inputs
|
@frappe.validate_and_sanitize_search_inputs
|
||||||
def get_project_name(doctype, txt, searchfield, start, page_len, filters):
|
def get_project_name(
|
||||||
|
doctype: str, txt: str, searchfield: str, start: int, page_len: int, filters: dict | None = None
|
||||||
|
):
|
||||||
proj = qb.DocType("Project")
|
proj = qb.DocType("Project")
|
||||||
qb_filter_and_conditions = []
|
qb_filter_and_conditions = []
|
||||||
qb_filter_or_conditions = []
|
qb_filter_or_conditions = []
|
||||||
@@ -321,7 +323,7 @@ def get_project_name(doctype, txt, searchfield, start, page_len, filters):
|
|||||||
if filters.get("company"):
|
if filters.get("company"):
|
||||||
qb_filter_and_conditions.append(proj.company == 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", "On hold"]))
|
||||||
|
|
||||||
q = qb.from_(proj)
|
q = qb.from_(proj)
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ frappe.query_reports["Project Summary"] = {
|
|||||||
fieldname: "status",
|
fieldname: "status",
|
||||||
label: __("Status"),
|
label: __("Status"),
|
||||||
fieldtype: "Select",
|
fieldtype: "Select",
|
||||||
options: "\nOpen\nCompleted\nCancelled",
|
options: "\nOpen\nOn hold\nCompleted\nCancelled",
|
||||||
default: "Open",
|
default: "Open",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user