[fix] Issue #6046 group_name replaced with name
diff --git a/erpnext/schools/doctype/course/course.py b/erpnext/schools/doctype/course/course.py
index beeb6ec..b590acb 100644
--- a/erpnext/schools/doctype/course/course.py
+++ b/erpnext/schools/doctype/course/course.py
@@ -14,9 +14,9 @@
user = frappe.session.user
student = frappe.db.sql("select name from `tabStudent` where student_email_id= %s", user)
if student:
- return frappe.db.sql('''select group_name, course, academic_term, academic_year, SG.name from `tabStudent Group`
- as SG, `tabStudent Group Student` as SGS where SG.group_name = SGS.parent and SGS.student = %s
- order by SG.group_name asc limit {0} , {1}'''.format(limit_start, limit_page_length), student, as_dict=True)
+ return frappe.db.sql('''select course, academic_term, academic_year, SG.name from `tabStudent Group`
+ as SG, `tabStudent Group Student` as SGS where SG.name = SGS.parent and SGS.student = %s
+ order by SG.name asc limit {0} , {1}'''.format(limit_start, limit_page_length), student, as_dict=True)
def get_list_context(context=None):
return {
diff --git a/erpnext/templates/includes/course/course_row.html b/erpnext/templates/includes/course/course_row.html
index 9b9317b..fddfc3c 100644
--- a/erpnext/templates/includes/course/course_row.html
+++ b/erpnext/templates/includes/course/course_row.html
@@ -5,7 +5,7 @@
{{ doc.course }}
</div>
<div class="col-xs-3">
- {{ doc.group_name }}
+ {{ doc.name }}
</div>
<div class="col-xs-2">
{{doc.academic_term }}