Merge branch 'develop'
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index ba95177..891439c 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '7.0.14'
+__version__ = '7.0.15'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/patches/v7_0/make_guardian.py b/erpnext/patches/v7_0/make_guardian.py
index b6b0a80..f2d0cf7 100644
--- a/erpnext/patches/v7_0/make_guardian.py
+++ b/erpnext/patches/v7_0/make_guardian.py
@@ -4,8 +4,9 @@
def execute():
if frappe.db.exists("DocType", "Student") and "father_name" in frappe.db.get_table_columns("Student"):
frappe.reload_doc("schools", "doctype", "student")
+ frappe.reload_doc("schools", "doctype", "guardian")
- students = frappe.get_list("Student", fields=["name", "father_name", "father_email_id",
+ students = frappe.get_all("Student", fields=["name", "father_name", "father_email_id",
"mother_name", "mother_email_id"])
for stud in students:
if stud.father_name: