Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes in program enrollment and tool

Browse Source
This commit is contained in:
Manas Solanki 2017-04-12 19:16:58 +05:30 committed by Nabin Hait
parent 310d238d17
commit 346928f2bc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/schools/doctype/program_enrollment/program_enrollment.json
View File

@ -205,7 +205,7 @@
"in_global_search": 1, "in_global_search": 1,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Batch Name", "label": "Batch",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Student Batch Name", "options": "Student Batch Name",
@ -412,7 +412,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2017-03-29 15:30:03.359985", "modified": "2017-04-06 15:21:43.137852",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Schools", "module": "Schools",
"name": "Program Enrollment", "name": "Program Enrollment",

6
erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py
View File

@ -11,11 +11,11 @@ from erpnext.schools.api import enroll_student
class ProgramEnrollmentTool(Document): class ProgramEnrollmentTool(Document):
def get_students(self): def get_students(self):
if not self.get_students_from: if not self.get_students_from:
frappe.throw(_("Mandatory feild - Get Students From")) frappe.throw(_("Mandatory field - Get Students From"))
elif not self.program: elif not self.program:
frappe.throw(_("Mandatory feild - Program")) frappe.throw(_("Mandatory field - Program"))
elif not self.academic_year: elif not self.academic_year:
frappe.throw(_("Mandatory feild - Academic Year")) frappe.throw(_("Mandatory field - Academic Year"))
else: else:
if self.get_students_from == "Student Applicants": if self.get_students_from == "Student Applicants":
students = frappe.db.sql("select name as student_applicant, title as student_name from \ students = frappe.db.sql("select name as student_applicant, title as student_name from \