Merge branch 'hotfix'

2016-10-18 18:35:18 +05:30 · 2016-10-18 18:35:18 +05:30 · b33695138c
commit b33695138c
parent 498cc1b7e1 8872842edf
2 changed files with 2 additions and 2 deletions
--- a/erpnext/init.py
+++ b/erpnext/init.py
@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe

-__version__ = '7.0.60'
+__version__ = '7.0.61'

 def get_default_company(user=None):
 	'''Get default company for user'''
--- a/erpnext/schools/doctype/student/student_dashboard.py
+++ b/erpnext/schools/doctype/student/student_dashboard.py
@ -1,7 +1,7 @@
 from frappe import _

 def get_data():
-	{
+	return {
 		'heatmap': True,
 		'heatmap_message': _('This is based on the attendance of this Student'),
 		'fieldname': 'student',