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

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

Browse Source 
Add hours to calendar labels
This commit is contained in:
Nabin Hait 2016-12-26 16:09:11 +05:30 committed by GitHub
commit 4573029a5e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -359,7 +359,8 @@ 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 as start_date, hours, activity_type, project, to_time as end_date from_time as start_date, hours, activity_type, project, to_time as end_date,
CONCAT(`tabTimesheet Detail`.parent, ' (', ROUND(hours,2),' hrs)') as title
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

3
erpnext/projects/doctype/timesheet/timesheet_calendar.js
View File

@ -6,7 +6,8 @@ frappe.views.calendar["Timesheet"] = {
"id": "name", "id": "name",
"title": "name", "title": "name",
"allDay": "allDay", "allDay": "allDay",
"child_name": "name" "child_name": "name",
"title": "title"
}, },
style_map: { style_map: {
"0": "info", "0": "info",