nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-09 23:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(projects): ignore cancelled invoices in timesheet portal (backport #58501) (#58503)

Browse Source 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
This commit is contained in:
mergify[bot]
2026-08-27 13:24:40 +00:00
committed by GitHub
parent 099a5a71d9
commit 5a518951e4
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/projects/doctype/timesheet/timesheet.py
View File

@@ -546,8 +546,14 @@ def get_timesheets_list(doctype, txt, filters, limit_start, limit_page_length=20
customer = contact.get_link_for("Customer") customer = contact.get_link_for("Customer")
if customer: if customer:
sales_invoices = frappe.get_all("Sales Invoice", filters={"customer": customer}, pluck="name") sales_invoices = frappe.get_all(
"Sales Invoice",
filters={"customer": customer, "docstatus": ["!=", 2]},
pluck="name",
)
projects = frappe.get_all("Project", filters={"customer": customer}, pluck="name") projects = frappe.get_all("Project", filters={"customer": customer}, pluck="name")
if not (sales_invoices or projects):
return []
# Return timesheet related data to web portal. # Return timesheet related data to web portal.
table = frappe.qb.DocType("Timesheet") table = frappe.qb.DocType("Timesheet")
@@ -577,10 +583,7 @@ def get_timesheets_list(doctype, txt, filters, limit_start, limit_page_length=20
if projects: if projects:
conditions.append(child_table.project.isin(projects)) conditions.append(child_table.project.isin(projects))
if conditions: return query.where(frappe.qb.terms.Criterion.any(conditions)).run(as_dict=True)
query = query.where(frappe.qb.terms.Criterion.any(conditions))
return query.run(as_dict=True)
else: else:
return {} return {}