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

fix(timesheet): handle empty allowed projects (backport #58745) (#58746)

Browse Source 
Co-authored-by: Krishna Pramod Shirsath <91021227+krishna-254@users.noreply.github.com>
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
This commit is contained in:
mergify[bot]
2026-09-04 07:02:33 +00:00
committed by GitHub
parent a1c8dc878d
commit f75601e9b1
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/projects/doctype/timesheet/test_timesheet.py
View File

@@ -1,7 +1,7 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt # See license.txt
import datetime import datetime
import unittest from unittest.mock import patch
import frappe import frappe
from frappe.utils import add_to_date, now_datetime, nowdate from frappe.utils import add_to_date, now_datetime, nowdate
@@ -9,12 +9,20 @@ from frappe.utils import add_to_date, now_datetime, nowdate
from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_sales_return from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_sales_return
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
from erpnext.projects.doctype.task.test_task import create_task from erpnext.projects.doctype.task.test_task import create_task
from erpnext.projects.doctype.timesheet.timesheet import OverlapError, make_sales_invoice from erpnext.projects.doctype.timesheet.timesheet import (
OverlapError,
get_projectwise_timesheet_data,
make_sales_invoice,
)
from erpnext.setup.doctype.employee.test_employee import make_employee from erpnext.setup.doctype.employee.test_employee import make_employee
from erpnext.tests.utils import ERPNextTestSuite from erpnext.tests.utils import ERPNextTestSuite
class TestTimesheet(ERPNextTestSuite): class TestTimesheet(ERPNextTestSuite):
def test_get_projectwise_timesheet_data_without_allowed_projects(self):
with patch("frappe.get_list", side_effect=[["TS-0001"], []]):
self.assertEqual(get_projectwise_timesheet_data(), [])
def test_timesheet_post_update(self): def test_timesheet_post_update(self):
frappe.get_doc( frappe.get_doc(
{ {

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

@@ -335,10 +335,14 @@ def get_projectwise_timesheet_data(project=None, parent=None, from_time=None, to
& (tsd.is_billable == 1) & (tsd.is_billable == 1)
& tsd.sales_invoice.isnull() & tsd.sales_invoice.isnull()
& (tsd.parent.isin(allowed_timesheets)) & (tsd.parent.isin(allowed_timesheets))
& ((tsd.project.isin(allowed_projects)) | (tsd.project.isnull()))
) )
) )
if allowed_projects:
query = query.where((tsd.project.isin(allowed_projects)) | (tsd.project.isnull()))
else:
query = query.where(tsd.project.isnull())
if project: if project:
query = query.where(tsd.project == project) query = query.where(tsd.project == project)
if parent: if parent: