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

Merge pull request #17908 from scmmishra/education-test-fixes

Browse Source 
test: fix fixtures for program and course
This commit is contained in:
sahil28297 2019-06-12 17:01:27 +05:30 committed by GitHub
commit 3fd51ccd38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/education/doctype/course/test_records.json
View File

@ -1,17 +1,14 @@
[
{
"course_name": "_Test Course",
"course_code": "TC100",
"course_name": "TC100",
"course_abbreviation": "TC"
},
{
"course_name": "_Test Course 1",
"course_code": "TC101",
"course_name": "TC101",
"course_abbreviation": "TC1"
},
{
"course_name": "_Test Course 2",
"course_code": "TC102",
"course_name": "TC102",
"course_abbreviation": "TC2"
}
]

6
erpnext/education/doctype/program/test_records.json
View File

@ -1,13 +1,11 @@
[
{
"program_name": "_Test Program 1",
"program_code": "_TP1",
"program_name": "_TP1",
"description": "Test Description",
"program_abbreviation": "TP1"
},
{
"program_name": "_Test Program 2",
"program_code": "_TP2",
"program_name": "_TP2",
"description": "Test Description",
"program_abbreviation": "TP2"
}

2
erpnext/education/doctype/program_enrollment/program_enrollment.py
View File

@ -66,7 +66,7 @@ class ProgramEnrollment(Document):
msgprint(_("Fee Records Created - {0}").format(comma_and(fee_list)))
def get_courses(self):
return frappe.db.sql('''select course, course_name from `tabProgram Course` where parent = %s and required = 1''', (self.program), as_dict=1)
return frappe.db.sql('''select course from `tabProgram Course` where parent = %s and required = 1''', (self.program), as_dict=1)
def create_course_enrollments(self):
student = frappe.get_doc("Student", self.student)