mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-27 05:45:19 +00:00
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
This commit is contained in:
@@ -2,7 +2,7 @@ import frappe
|
|||||||
from frappe import _
|
from frappe import _
|
||||||
from frappe.desk.query_report import get_filtered_data
|
from frappe.desk.query_report import get_filtered_data
|
||||||
from frappe.model.docstatus import DocStatus
|
from frappe.model.docstatus import DocStatus
|
||||||
from frappe.utils import getdate
|
from frappe.utils import add_days, getdate
|
||||||
|
|
||||||
VALUE_FIELDNAMES = ("hours", "billing_hours", "billing_amount")
|
VALUE_FIELDNAMES = ("hours", "billing_hours", "billing_amount")
|
||||||
|
|
||||||
@@ -99,7 +99,7 @@ def get_data(filters):
|
|||||||
if filters.get("from_date"):
|
if filters.get("from_date"):
|
||||||
_filters.append(("Timesheet Detail", "from_time", ">=", filters.get("from_date")))
|
_filters.append(("Timesheet Detail", "from_time", ">=", filters.get("from_date")))
|
||||||
if filters.get("to_date"):
|
if filters.get("to_date"):
|
||||||
_filters.append(("Timesheet Detail", "to_time", "<=", filters.get("to_date") + " 23:59:59"))
|
_filters.append(("Timesheet Detail", "from_time", "<", add_days(getdate(filters.get("to_date")), 1)))
|
||||||
if not filters.get("include_draft_timesheets"):
|
if not filters.get("include_draft_timesheets"):
|
||||||
_filters.append(("docstatus", "=", DocStatus.submitted()))
|
_filters.append(("docstatus", "=", DocStatus.submitted()))
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user