nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: timesheet filter date exclusive issue (#25626)

Browse Source
This commit is contained in:
Anupam Kumar
2021-05-07 20:26:50 +05:30
committed by GitHub
parent 27cf19a19f
commit da7fefe29d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,7 +209,7 @@ def get_projectwise_timesheet_data(project, parent=None, from_time=None, to_time
if parent: if parent:
condition = "AND parent = %(parent)s" condition = "AND parent = %(parent)s"
if from_time and to_time: if from_time and to_time:
condition += "AND from_time BETWEEN %(from_time)s AND %(to_time)s" condition += "AND CAST(from_time as DATE) BETWEEN %(from_time)s AND %(to_time)s"
return frappe.db.sql("""select name, parent, billing_hours, billing_amount as billing_amt return frappe.db.sql("""select name, parent, billing_hours, billing_amount as billing_amt
from `tabTimesheet Detail` where parenttype = 'Timesheet' and docstatus=1 and project = %(project)s {0} and billable = 1 from `tabTimesheet Detail` where parenttype = 'Timesheet' and docstatus=1 and project = %(project)s {0} and billable = 1