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

Merge pull request #6719 from frappe/bcornwellmott-patch-1

Browse Source 
Fix calendar view for Timesheet
This commit is contained in:
Nabin Hait 2016-10-29 14:41:42 +05:30 committed by GitHub
commit 44281b7a01
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,7 +369,7 @@ def get_events(start, end, filters=None):
conditions = get_conditions(filters) conditions = get_conditions(filters)
return frappe.db.sql("""select `tabTimesheet Detail`.name as name, return frappe.db.sql("""select `tabTimesheet Detail`.name as name,
`tabTimesheet Detail`.docstatus as status, `tabTimesheet Detail`.parent as parent, `tabTimesheet Detail`.docstatus as status, `tabTimesheet Detail`.parent as parent,
from_time, hours, activity_type, project, to_time from_time as start_date, hours, activity_type, project, to_time as end_date
from `tabTimesheet Detail`, `tabTimesheet` from `tabTimesheet Detail`, `tabTimesheet`
where `tabTimesheet Detail`.parent = `tabTimesheet`.name where `tabTimesheet Detail`.parent = `tabTimesheet`.name
and `tabTimesheet`.docstatus < 2 and `tabTimesheet`.docstatus < 2