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

[Fix] Fix in program enrollment tool and report

Browse Source
This commit is contained in:
Manas Solanki 2017-03-30 12:17:40 +05:30 committed by Nabin Hait
parent f912317fae
commit 3528d08178
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/config/schools.py
View File

@ -29,7 +29,14 @@ def get_data():
{ {
"type": "doctype", "type": "doctype",
"name": "Student Group Creation Tool" "name": "Student Group Creation Tool"
},
{
"type": "report",
"is_query_report": True,
"name": "Student and Guardian Contact Details",
"doctype": "Program Enrollment"
} }
] ]
}, },
{ {

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

@ -21,7 +21,7 @@ class ProgramEnrollmentTool(Document):
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 \
`tabStudent Applicant` where program = %s and academic_year = %s",(self.program, self.academic_year), as_dict=1) `tabStudent Applicant` where program = %s and academic_year = %s",(self.program, self.academic_year), as_dict=1)
else: else:
students = frappe.db.sql("select student, student_name from \ students = frappe.db.sql("select student, student_name, student_batch_name from \
`tabProgram Enrollment` where program = %s and academic_year = %s",(self.program, self.academic_year), as_dict=1) `tabProgram Enrollment` where program = %s and academic_year = %s",(self.program, self.academic_year), as_dict=1)
student_list = [d.student for d in students] student_list = [d.student for d in students]
@ -44,6 +44,7 @@ class ProgramEnrollmentTool(Document):
prog_enrollment = frappe.new_doc("Program Enrollment") prog_enrollment = frappe.new_doc("Program Enrollment")
prog_enrollment.student = stud.student prog_enrollment.student = stud.student
prog_enrollment.student_name = stud.student_name prog_enrollment.student_name = stud.student_name
prog_enrollment.student_batch_name = stud.student_batch_name
prog_enrollment.program = self.new_program prog_enrollment.program = self.new_program
prog_enrollment.academic_year = self.new_academic_year prog_enrollment.academic_year = self.new_academic_year
prog_enrollment.save() prog_enrollment.save()