Merge pull request #6642 from neilLasrado/develop
Fixes to Schools Module
diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.py b/erpnext/schools/doctype/program_enrollment/program_enrollment.py
index a15a070..02c6fe7 100644
--- a/erpnext/schools/doctype/program_enrollment/program_enrollment.py
+++ b/erpnext/schools/doctype/program_enrollment/program_enrollment.py
@@ -11,6 +11,8 @@
class ProgramEnrollment(Document):
def validate(self):
self.validate_duplication()
+ if not self.student_name:
+ self.student_name = frappe.db.get_value("Student", self.student, "title")
def on_submit(self):
self.update_student_joining_date()
diff --git a/erpnext/schools/doctype/student/student.json b/erpnext/schools/doctype/student/student.json
index 22e229c..c4b8667 100644
--- a/erpnext/schools/doctype/student/student.json
+++ b/erpnext/schools/doctype/student/student.json
@@ -386,7 +386,7 @@
"collapsible": 0,
"columns": 0,
"fieldname": "nationality",
- "fieldtype": "Link",
+ "fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -395,7 +395,7 @@
"label": "Nationality",
"length": 0,
"no_copy": 0,
- "options": "Country",
+ "options": "",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -762,7 +762,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-09-08 06:29:27.702968",
+ "modified": "2016-10-07 15:36:39.936505",
"modified_by": "Administrator",
"module": "Schools",
"name": "Student",
@@ -779,6 +779,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,