Merge branch 'develop'
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index a16d792..c6fd27d 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '7.0.24'
+__version__ = '7.0.25'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/patches/v7_0/migrate_schools_to_erpnext.py b/erpnext/patches/v7_0/migrate_schools_to_erpnext.py
index c222da8..695f6cc 100644
--- a/erpnext/patches/v7_0/migrate_schools_to_erpnext.py
+++ b/erpnext/patches/v7_0/migrate_schools_to_erpnext.py
@@ -22,4 +22,4 @@
def reload_doctypes_for_schools_icons():
for d in frappe.get_all('DocType', filters={'module': 'Schools'}):
- frappe.reload_doc('schools', 'doctype', d.name)
+ frappe.reload_doc('schools', 'doctype', frappe.scrub(d.name))