Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "proposed usage of daterange picker"

Browse Source
This commit is contained in:
Nabin Hait 2017-01-10 12:19:48 +05:30 committed by GitHub
parent 6e9d2a3c1f
commit 01baceb74e
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.js
View File

@ -4,12 +4,16 @@
frappe.query_reports["Daily Timesheet Summary"] = { frappe.query_reports["Daily Timesheet Summary"] = {
"filters": [ "filters": [
{ {
"fieldname":"date", "fieldname":"from_date",
"label": __("Date"), "label": __("From Date"),
"fieldtype": "DateRange", "fieldtype": "Date",
"start_with_value": true, "default": frappe.datetime.get_today()
"default_from":frappe.datetime.get_today(), },
"default_to":frappe.datetime.get_today(), {
"fieldname":"to_date",
"label": __("To Date"),
"fieldtype": "Date",
"default": frappe.datetime.get_today()
}, },
] ]
} }

4
erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py
View File

@ -9,9 +9,7 @@ from frappe.desk.reportview import build_match_conditions
def execute(filters=None): def execute(filters=None):
if not filters: if not filters:
filters = {} filters = {}
elif filters.get("date") : elif filters.get("from_date") or filters.get("to_date"):
filters["from_date"] = filters["date"][0]
filters["to_date"] = filters["date"][1]
filters["from_time"] = "00:00:00" filters["from_time"] = "00:00:00"
filters["to_time"] = "24:00:00" filters["to_time"] = "24:00:00"