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

Merge pull request #7418 from frappe/revert-7409-daterangecontrol

Browse Source 
Revert "proposed usage of daterange picker"
This commit is contained in:
Nabin Hait 2017-01-10 12:20:14 +05:30 committed by GitHub
commit b083591164
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"] = {
"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()
},
]
}

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):
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"