nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Nabin Hait
2016-10-18 18:35:18 +05:30
parent 498cc1b7e1 8872842edf
commit fc787193ad
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '7.0.60' __version__ = '7.0.61'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/schools/doctype/student/student_dashboard.py
View File

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