commit b33695138c50f0127de003a594bc39263d092613
author Nabin Hait <nabinhait@gmail.com> Tue Oct 18 18:35:18 2016 +0530
committer Nabin Hait <nabinhait@gmail.com> Tue Oct 18 18:35:18 2016 +0530
tree 73d1c62ff738fa0ed0b329e58caa626175206f2f
parent 498cc1b7e138f44ed7c435ada42e839627c88316
parent 8872842edff2fd4109b1990bc6e528e5693fe9a7

Merge branch 'hotfix'

erpnext/__init__.py

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 32b86b2..920a600 100644
--- 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'''

erpnext/schools/doctype/student/student_dashboard.py

diff --git a/erpnext/schools/doctype/student/student_dashboard.py b/erpnext/schools/doctype/student/student_dashboard.py
index 8b59b6b..6d95168 100644
--- 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',