From 01baceb74e416b66d16ac31eb7586a30c8fd2cdb Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 10 Jan 2017 12:19:48 +0530 Subject: [PATCH] Revert "proposed usage of daterange picker" --- .../daily_timesheet_summary.js | 16 ++++++++++------ .../daily_timesheet_summary.py | 4 +--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.js b/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.js index d085a330fd2..93cb9402fa8 100644 --- a/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.js +++ b/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.js @@ -4,12 +4,16 @@ frappe.query_reports["Daily Timesheet Summary"] = { "filters": [ { - "fieldname":"date", - "label": __("Date"), - "fieldtype": "DateRange", - "start_with_value": true, - "default_from":frappe.datetime.get_today(), - "default_to":frappe.datetime.get_today(), + "fieldname":"from_date", + "label": __("From Date"), + "fieldtype": "Date", + "default": frappe.datetime.get_today() + }, + { + "fieldname":"to_date", + "label": __("To Date"), + "fieldtype": "Date", + "default": frappe.datetime.get_today() }, ] } diff --git a/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py b/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py index 6ed3b5801fc..682fb2e09dc 100644 --- a/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +++ b/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py @@ -9,9 +9,7 @@ from frappe.desk.reportview import build_match_conditions def execute(filters=None): if not filters: filters = {} - elif filters.get("date") : - filters["from_date"] = filters["date"][0] - filters["to_date"] = filters["date"][1] + elif filters.get("from_date") or filters.get("to_date"): filters["from_time"] = "00:00:00" filters["to_time"] = "24:00:00"