From 966f141f624a1e68d5f1ee7f0500618aa9b5ef50 Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Thu, 23 Nov 2017 15:22:10 +0530 Subject: [PATCH] Rename schools to Education (#11524) * renaming for the docs, demo data and patch * changes in the doctypes and reports * rename the config file * Few name changes in messages and license * rename the school settings to education settings * changes in the documentation * added the setup file for the fixtures * corrected the ui tests file path * fix the codacy * add the patch for renaming few doctypes and fields * changes in the patch --- .eslintrc | 1 + erpnext/config/desktop.py | 16 +- erpnext/config/{schools.py => education.py} | 2 +- ...{item_schools.json => item_education.json} | 0 erpnext/demo/demo.py | 4 +- erpnext/demo/setup/education.py | 2 +- erpnext/demo/setup/setup_data.py | 4 +- .../demo/user/{schools.py => education.py} | 8 +- .../img/{schools => education}/__init__.py | 0 .../admission/__init__.py | 0 .../admission/program-enrollment-tool.gif | Bin .../admission/program-enrollment-tool01.gif | Bin .../admission/program-enrollment.gif | Bin .../admission/student-admission.gif | Bin .../admission/student-applicant-enroll.png | Bin .../admission/student-applicant.png | Bin .../admission/student-application-actions.png | Bin .../assessment/__init__.py | 0 .../assessment/assessment-criteria.png | Bin .../assessment/assessment-group-details.png | Bin .../assessment/assessment-group-term.png | Bin .../assessment/assessment-plan-criteria.png | Bin .../assessment/assessment-plan-details.png | Bin .../assessment/assessment-result-tool.png | Bin .../assessment/assessment-result.png | Bin .../assessment/grading-scale.png | Bin .../{schools => education}/fees/__init__.py | 0 .../fees/fee-category.png | Bin .../fees/fee-structure.png | Bin .../fees/fees-section.png | Bin .../img/{schools => education}/fees/fees.png | Bin .../img/{schools => education}/home.png | Bin .../img/{schools => education}/module.png | Bin .../schedule/__init__.py | 0 .../schedule/course-schedule-att-1.png | Bin .../schedule/course-schedule-att.png | Bin .../schedule/course-schedule.png | Bin .../schedule/examination.png | Bin .../schedule/schedule-section.png | Bin .../schedule/scheduling-tool.png | Bin .../schedule/student-attendance.gif | Bin .../schedule/student-attendance.png | Bin .../schedule/student-leave-application.gif | Bin .../setup/Course-schedule-error.png | Bin .../setup/Room-Assesment-plan.png | Bin .../{schools => education}/setup/__init__.py | 0 .../setup/academic-term.png | Bin .../setup/academic-year.png | Bin .../setup/course-fee-program.png | Bin .../{schools => education}/setup/course.png | Bin .../setup/instructor.png | Bin .../{schools => education}/setup/program.png | Bin .../img/{schools => education}/setup/room.png | Bin .../setup/student-attendance-tool.gif | Bin .../setup/student-group-instructor.png | Bin .../student/__init__.py | 0 .../student/guardian.png | Bin .../student/schools-settings.png | Bin .../student/student group.gif | Bin .../student/student-admission.gif | Bin .../student/student-batch-validation.gif | Bin .../student/student-batch.gif | Bin .../student/student-course-validation.gif | Bin .../student/student-group-attendance.gif | Bin .../student/student-group-creation-tool.gif | Bin .../student/student-log.png | Bin .../student/student.png | Bin .../Assessment/__init__.py | 0 .../Assessment/assessment_criteria.md | 4 +- .../Assessment/assessment_criteria_group.md | 0 .../Assessment/assessment_group.md | 4 +- .../Assessment/assessment_plan.md | 4 +- .../Assessment/assessment_result.md | 4 +- .../Assessment/assessment_result_tool.md | 2 +- .../Assessment/grading_scale.md | 2 +- .../Assessment/index.md | 0 .../Assessment/index.txt | 0 .../Attendance/__init__.py | 0 .../Attendance/index.md | 0 .../Attendance/index.txt | 0 .../Attendance/student-attendance-tool.md | 2 +- .../Attendance/student-attendance.md | 2 +- .../Attendance/student-leave-application.md | 4 +- .../en/{schools => education}/__init__.py | 0 .../admission/__init__.py | 0 .../{schools => education}/admission/index.md | 0 .../admission/index.txt | 0 .../admission/program-enrollment-tool.md | 4 +- .../admission/program-enrollment.md | 2 +- .../admission/student-applicant.md | 8 +- .../admission/student_admission.md | 4 +- .../{schools => education}/fees/__init__.py | 0 .../fees/fee-category.md | 2 +- .../fees/fee-structure.md | 2 +- .../user/manual/en/education/fees/fees.md | 8 + .../en/{schools => education}/fees/index.md | 2 +- .../en/{schools => education}/fees/index.txt | 0 .../docs/user/manual/en/education/index.md | 8 + .../en/{schools => education}/index.txt | 0 .../schedule/__init__.py | 0 .../schedule/course-schedule.md | 6 +- .../schedule/examination.md | 2 +- .../{schools => education}/schedule/index.md | 2 +- .../{schools => education}/schedule/index.txt | 0 .../schedule/scheduling-tool.md | 2 +- .../{schools => education}/setup/__init__.py | 0 .../setup/academic-term.md | 2 +- .../setup/academic-year.md | 4 +- .../en/{schools => education}/setup/course.md | 4 +- .../user/manual/en/education/setup/index.md | 9 + .../en/{schools => education}/setup/index.txt | 2 +- .../setup/instructor.md | 6 +- .../{schools => education}/setup/program.md | 6 +- .../en/{schools => education}/setup/room.md | 6 +- .../en/education/setup/school-settings.md | 15 + .../setup/student-batch-name.md | 2 +- .../setup/student-category.md | 2 +- .../student/__init__.py | 0 .../student/guardian.md | 2 +- .../{schools => education}/student/index.md | 0 .../{schools => education}/student/index.txt | 0 .../student/student-batch.md | 2 +- .../student/student-group-creation-tool.md | 4 +- .../student/student-group.md | 6 +- .../student/student-log.md | 2 +- .../{schools => education}/student/student.md | 2 +- erpnext/docs/user/manual/en/index.txt | 1 + .../docs/user/manual/en/schools/fees/fees.md | 8 - erpnext/docs/user/manual/en/schools/index.md | 8 - .../user/manual/en/schools/setup/index.md | 9 - .../en/schools/setup/school-settings.md | 15 - .../Assessment/__init__.py | 0 .../Assessment/assessment_criteria.md | 4 +- .../Assessment/assessment_group.md | 4 +- .../Assessment/assessment_plan.md | 4 +- .../Assessment/assessment_result.md | 4 +- .../Assessment/assessment_result_tool.md | 2 +- .../Assessment/grading_scale.md | 2 +- .../Assessment/index.md | 0 .../Assessment/index.txt | 0 .../es/{schools => education}/__init__.py | 0 .../admission/__init__.py | 0 .../{schools => education}/admission/index.md | 0 .../admission/index.txt | 0 .../admission/program-enrollment.md | 2 +- .../admission/student-applicant.md | 6 +- .../{schools => education}/fees/__init__.py | 0 .../fees/fee-category.md | 2 +- .../fees/fee-structure.md | 2 +- .../user/manual/es/education/fees/fees.md | 8 + .../es/{schools => education}/fees/index.md | 2 +- .../es/{schools => education}/fees/index.txt | 0 .../manual/es/{schools => education}/index.md | 4 +- .../es/{schools => education}/index.txt | 0 .../schedule/__init__.py | 0 .../schedule/course-schedule.md | 6 +- .../schedule/examination.md | 2 +- .../{schools => education}/schedule/index.md | 2 +- .../{schools => education}/schedule/index.txt | 0 .../schedule/scheduling-tool.md | 2 +- .../schedule/student-attendance.md | 2 +- .../{schools => education}/setup/__init__.py | 0 .../setup/academic-term.md | 2 +- .../setup/academic-year.md | 2 +- .../user/manual/es/education/setup/course.md | 5 + .../es/{schools => education}/setup/index.md | 2 +- .../es/{schools => education}/setup/index.txt | 0 .../manual/es/education/setup/instructor.md | 5 + .../user/manual/es/education/setup/program.md | 5 + .../user/manual/es/education/setup/room.md | 6 + .../student/__init__.py | 0 .../{schools => education}/student/index.md | 0 .../{schools => education}/student/index.txt | 0 .../student/student-batch.md | 2 +- .../student/student-group-creation-tool.md | 2 +- .../student/student-group.md | 2 +- .../student/student-log.md | 2 +- .../{schools => education}/student/student.md | 2 +- erpnext/docs/user/manual/es/index.txt | 2 +- .../docs/user/manual/es/schools/fees/fees.md | 8 - .../user/manual/es/schools/setup/course.md | 5 - .../manual/es/schools/setup/instructor.md | 5 - .../user/manual/es/schools/setup/program.md | 5 - .../docs/user/manual/es/schools/setup/room.md | 6 - erpnext/docs/user/videos/learn/education.md | 7 + erpnext/docs/user/videos/learn/index.md | 4 +- erpnext/docs/user/videos/learn/schools.md | 7 - erpnext/domains/education.py | 23 +- erpnext/{schools => education}/__init__.py | 0 erpnext/{schools => education}/api.py | 0 .../doctype/__init__.py | 0 .../doctype/academic_term/__init__.py | 0 .../doctype/academic_term/academic_term.js | 0 .../doctype/academic_term/academic_term.json | 4 +- .../doctype/academic_term/academic_term.py | 0 .../academic_term/test_academic_term.js | 4 +- .../academic_term/test_academic_term.py | 0 .../doctype/academic_term/test_records.json | 0 .../doctype/academic_year/__init__.py | 0 .../doctype/academic_year/academic_year.js | 0 .../doctype/academic_year/academic_year.json | 4 +- .../doctype/academic_year/academic_year.py | 0 .../academic_year/test_academic_year.js | 4 +- .../academic_year/test_academic_year.py | 0 .../doctype/academic_year/test_records.json | 0 .../doctype/assessment_criteria/__init__.py | 0 .../assessment_criteria.js | 0 .../assessment_criteria.json | 4 +- .../assessment_criteria.py | 0 .../test_assessment_criteria.js | 4 +- .../test_assessment_criteria.py | 0 .../assessment_criteria/test_records.json | 0 .../assessment_criteria_group/__init__.py | 0 .../assessment_criteria_group.js | 0 .../assessment_criteria_group.json | 4 +- .../assessment_criteria_group.py | 0 .../test_assessment_criteria_group.js | 4 +- .../test_assessment_criteria_group.py | 0 .../doctype/assessment_group/__init__.py | 0 .../assessment_group/assessment_group.js | 0 .../assessment_group/assessment_group.json | 4 +- .../assessment_group/assessment_group.py | 0 .../assessment_group/assessment_group_tree.js | 0 .../assessment_group/test_assessment_group.js | 4 +- .../assessment_group/test_assessment_group.py | 0 .../doctype/assessment_plan/__init__.py | 0 .../assessment_plan/assessment_plan.js | 2 +- .../assessment_plan/assessment_plan.json | 4 +- .../assessment_plan/assessment_plan.py | 2 +- .../assessment_plan/test_assessment_plan.js | 4 +- .../assessment_plan/test_assessment_plan.py | 0 .../assessment_plan_criteria/__init__.py | 0 .../assessment_plan_criteria.json | 4 +- .../assessment_plan_criteria.py | 0 .../doctype/assessment_result/__init__.py | 0 .../assessment_result/assessment_result.js | 4 +- .../assessment_result/assessment_result.json | 4 +- .../assessment_result/assessment_result.py | 4 +- .../test_assessment_result.js | 6 +- .../test_assessment_result.py | 2 +- .../assessment_result_detail/__init__.py | 0 .../assessment_result_detail.json | 4 +- .../assessment_result_detail.py | 0 .../assessment_result_tool/__init__.py | 0 .../assessment_result_tool.js | 8 +- .../assessment_result_tool.json | 4 +- .../assessment_result_tool.py | 0 .../test_assessment_result_tool.js | 4 +- .../test_assessment_result_tool.py | 10 + .../doctype/course/__init__.py | 0 .../doctype/course/course.js | 0 .../doctype/course/course.json | 4 +- .../doctype/course/course.py | 0 .../doctype/course/test_course.js | 4 +- .../doctype/course/test_course.py | 0 .../doctype/course/test_records.json | 0 .../course_assessment_criteria/__init__.py | 0 .../course_assessment_criteria.json | 4 +- .../course_assessment_criteria.py | 0 .../doctype/course_schedule/__init__.py | 0 .../course_schedule/course_schedule.js | 2 +- .../course_schedule/course_schedule.json | 4 +- .../course_schedule/course_schedule.py | 2 +- .../course_schedule_calendar.js | 2 +- .../course_schedule/test_course_schedule.js | 23 + .../course_schedule/test_course_schedule.py | 2 +- .../course_scheduling_tool/__init__.py | 0 .../course_scheduling_tool.js | 0 .../course_scheduling_tool.json | 2 +- .../course_scheduling_tool.py | 2 +- .../test_course_scheduling_tool.js | 23 + .../test_course_scheduling_tool.py | 10 + .../doctype/education_settings}/__init__.py | 0 .../education_settings/education_settings.js} | 2 +- .../education_settings.json} | 6 +- .../education_settings/education_settings.py} | 9 +- .../test_education_settings.js} | 18 +- .../test_education_settings.py | 10 + .../doctype/fee_category}/__init__.py | 0 .../doctype/fee_category/fee_category.js | 0 .../doctype/fee_category/fee_category.json | 4 +- .../doctype/fee_category/fee_category.py | 0 .../doctype/fee_category/test_fee_category.js | 23 + .../doctype/fee_category/test_fee_category.py | 0 .../doctype/fee_category/test_records.json | 0 .../doctype/fee_component}/__init__.py | 0 .../doctype/fee_component/fee_component.json | 4 +- .../doctype/fee_component/fee_component.py | 0 .../doctype/fee_schedule}/__init__.py | 0 .../doctype/fee_schedule/fee_schedule.js | 4 +- .../doctype/fee_schedule/fee_schedule.json | 4 +- .../doctype/fee_schedule/fee_schedule.py | 0 .../doctype/fee_schedule/fee_schedule_list.js | 0 .../doctype/fee_schedule/test_fee_schedule.js | 0 .../doctype/fee_schedule/test_fee_schedule.py | 0 .../doctype/fee_schedule_program}/__init__.py | 0 .../fee_schedule_program.json | 4 +- .../fee_schedule_program.py | 0 .../fee_schedule_student_group}/__init__.py | 0 .../fee_schedule_student_group.json | 4 +- .../fee_schedule_student_group.py | 0 .../doctype/fee_structure}/__init__.py | 0 .../doctype/fee_structure/fee_structure.js | 2 +- .../doctype/fee_structure/fee_structure.json | 4 +- .../doctype/fee_structure/fee_structure.py | 0 .../fee_structure/test_fee_structure.js | 0 .../fee_structure/test_fee_structure.py | 0 .../doctype/fee_structure/test_records.json | 0 .../doctype/fees}/__init__.py | 0 .../doctype/fees/fees.js | 4 +- .../doctype/fees/fees.json | 4 +- .../doctype/fees/fees.py | 0 .../doctype/fees/fees_list.js | 0 .../doctype/fees/test_fees.js | 0 .../doctype/fees/test_fees.py | 0 .../doctype/grading_scale}/__init__.py | 0 .../doctype/grading_scale/grading_scale.js | 0 .../doctype/grading_scale/grading_scale.json | 4 +- .../doctype/grading_scale/grading_scale.py | 0 .../grading_scale/test_grading_scale.js | 4 +- .../grading_scale/test_grading_scale.py | 0 .../doctype/grading_scale/test_records.json | 0 .../grading_scale_interval}/__init__.py | 0 .../grading_scale_interval.json | 4 +- .../grading_scale_interval.py | 0 .../doctype/guardian}/__init__.py | 0 .../doctype/guardian/guardian.js | 0 .../doctype/guardian/guardian.json | 4 +- .../doctype/guardian/guardian.py | 0 .../doctype/guardian/test_guardian.js | 4 +- .../doctype/guardian/test_guardian.py | 0 .../doctype/guardian_interest}/__init__.py | 0 .../guardian_interest/guardian_interest.json | 4 +- .../guardian_interest/guardian_interest.py | 0 .../doctype/guardian_student}/__init__.py | 0 .../guardian_student/guardian_student.json | 4 +- .../guardian_student/guardian_student.py | 0 .../doctype/instructor}/__init__.py | 0 .../doctype/instructor/instructor.js | 0 .../doctype/instructor/instructor.json | 4 +- .../doctype/instructor/instructor.py | 4 +- .../doctype/instructor/test_instructor.js | 4 +- .../doctype/instructor/test_instructor.py | 0 .../doctype/instructor/test_records.json | 0 .../doctype/program}/__init__.py | 0 .../doctype/program/program.js | 0 .../doctype/program/program.json | 4 +- .../doctype/program/program.py | 0 .../doctype/program/test_program.js | 4 +- .../doctype/program/test_program.py | 0 .../doctype/program/test_records.json | 0 .../doctype/program_course}/__init__.py | 0 .../program_course/program_course.json | 4 +- .../doctype/program_course/program_course.py | 0 .../doctype/program_enrollment}/__init__.py | 0 .../program_enrollment/program_enrollment.js | 6 +- .../program_enrollment.json | 6 +- .../program_enrollment/program_enrollment.py | 2 +- .../test_program_enrollment.js | 23 + .../test_program_enrollment.py | 0 .../program_enrollment_course}/__init__.py | 0 .../program_enrollment_course.json | 4 +- .../program_enrollment_course.py | 0 .../program_enrollment_fee}/__init__.py | 0 .../program_enrollment_fee.json | 4 +- .../program_enrollment_fee.py | 0 .../program_enrollment_tool}/__init__.py | 0 .../program_enrollment_tool.js | 0 .../program_enrollment_tool.json | 4 +- .../program_enrollment_tool.py | 2 +- .../test_program_enrollment_tool.js | 23 + .../test_program_enrollment_tool.py | 10 + .../__init__.py | 0 .../program_enrollment_tool_student.json | 4 +- .../program_enrollment_tool_student.py | 0 .../doctype/program_fee}/__init__.py | 0 .../doctype/program_fee/program_fee.json | 4 +- .../doctype/program_fee/program_fee.py | 0 .../doctype/room}/__init__.py | 0 .../doctype/room/room.js | 0 .../doctype/room/room.json | 4 +- .../doctype/room/room.py | 0 .../doctype/room/test_records.json | 0 .../doctype/room/test_room.js | 4 +- .../doctype/room/test_room.py | 0 .../doctype/school_house}/__init__.py | 0 .../doctype/school_house/school_house.js | 0 .../doctype/school_house/school_house.json | 4 +- .../doctype/school_house/school_house.py | 0 .../doctype/school_house/test_school_house.js | 23 + .../doctype/school_house/test_school_house.py | 0 .../doctype/student/__init__.py | 0 .../doctype/student/student.js | 0 .../doctype/student/student.json | 4 +- .../doctype/student/student.py | 0 .../doctype/student/student_dashboard.py | 0 .../doctype/student/student_list.js | 0 .../doctype/student/test_records.json | 0 .../education/doctype/student/test_student.js | 23 + .../doctype/student/test_student.py | 0 .../doctype/student_admission/__init__.py | 0 .../student_admission/student_admission.js | 0 .../student_admission/student_admission.json | 4 +- .../student_admission/student_admission.py | 2 +- .../templates/student_admission.html | 0 .../templates/student_admission_row.html | 0 .../test_student_admission.js | 4 +- .../test_student_admission.py | 0 .../student_admission_program/__init__.py | 0 .../student_admission_program.json | 4 +- .../student_admission_program.py | 0 .../doctype/student_applicant/__init__.py | 0 .../student_applicant/student_applicant.js | 2 +- .../student_applicant/student_applicant.json | 4 +- .../student_applicant/student_applicant.py | 0 .../student_applicant_list.js | 0 .../test_student_applicant.py | 0 .../tests/test_student_applicant.js | 4 +- .../test_student_applicant_dummy_data.js | 0 .../tests/test_student_applicant_options.js | 4 +- .../doctype/student_attendance/__init__.py | 0 .../student_attendance/student_attendance.js | 0 .../student_attendance.json | 4 +- .../student_attendance/student_attendance.py | 2 +- .../student_attendance_list.js | 0 .../test_student_attendance.js | 4 +- .../test_student_attendance.py | 0 .../student_attendance_tool/__init__.py | 0 .../student_attendance_tool.js | 10 +- .../student_attendance_tool.json | 4 +- .../student_attendance_tool.py | 0 .../test_student_attendance_tool.js | 4 +- .../test_student_attendance_tool.py | 10 + .../doctype/student_batch_name/__init__.py | 0 .../student_batch_name/student_batch_name.js | 0 .../student_batch_name.json | 4 +- .../student_batch_name/student_batch_name.py | 0 .../student_batch_name/test_records.json | 0 .../test_student_batch_name.js | 4 +- .../test_student_batch_name.py | 0 .../doctype/student_category/__init__.py | 0 .../student_category/student_category.js | 0 .../student_category/student_category.json | 4 +- .../student_category/student_category.py | 0 .../student_category/test_student_category.js | 4 +- .../student_category/test_student_category.py | 0 .../doctype/student_group/__init__.py | 0 .../doctype/student_group/student_group.js | 6 +- .../doctype/student_group/student_group.json | 4 +- .../doctype/student_group/student_group.py | 2 +- .../doctype/student_group/test_records.json | 0 .../student_group/test_student_group.js | 4 +- .../student_group/test_student_group.py | 0 .../student_group_creation_tool/__init__.py | 0 .../student_group_creation_tool.js | 0 .../student_group_creation_tool.json | 4 +- .../student_group_creation_tool.py | 2 +- .../test_student_group_creation_tool.js | 2 +- .../test_student_group_creation_tool.py | 10 + .../__init__.py | 0 .../student_group_creation_tool_course.json | 4 +- .../student_group_creation_tool_course.py | 0 .../student_group_instructor/__init__.py | 0 .../student_group_instructor.json | 7 +- .../student_group_instructor.py | 0 .../doctype/student_group_student/__init__.py | 0 .../student_group_student.json | 9 +- .../student_group_student.py | 0 .../doctype/student_guardian/__init__.py | 0 .../student_guardian/student_guardian.json | 10 +- .../student_guardian/student_guardian.py | 0 .../doctype/student_language/__init__.py | 0 .../student_language/student_language.js | 0 .../student_language/student_language.json | 10 +- .../student_language/student_language.py | 0 .../student_language/test_student_language.js | 23 + .../student_language/test_student_language.py | 0 .../student_leave_application/__init__.py | 0 .../student_leave_application.js | 0 .../student_leave_application.json | 357 ++++++++++++++++ .../student_leave_application.py | 0 .../test_student_leave_application.js | 4 +- .../test_student_leave_application.py | 0 .../doctype/student_log/__init__.py | 0 .../doctype/student_log/student_log.js | 0 .../doctype/student_log/student_log.json | 400 ++++++++++++++++++ .../doctype/student_log/student_log.py | 0 .../doctype/student_log/test_student_log.js | 4 +- .../doctype/student_log/test_student_log.py | 0 .../doctype/student_sibling/__init__.py | 0 .../student_sibling/student_sibling.json | 12 +- .../student_sibling/student_sibling.py | 0 .../doctype/student_siblings/__init__.py | 0 .../student_siblings/student_siblings.json | 21 +- .../student_siblings/student_siblings.py | 0 .../{schools => education}/report/__init__.py | 0 .../report/absent_student_report/__init__.py | 0 .../absent_student_report.js | 0 .../absent_student_report.json | 4 +- .../absent_student_report.py | 0 .../course_wise_assessment_report/__init__.py | 0 .../course_wise_assessment_report.html | 0 .../course_wise_assessment_report.js | 0 .../course_wise_assessment_report.json | 4 +- .../course_wise_assessment_report.py | 2 +- .../__init__.py | 0 .../student_and_guardian_contact_details.js | 0 .../student_and_guardian_contact_details.json | 4 +- .../student_and_guardian_contact_details.py | 0 .../student_batch_wise_attendance/__init__.py | 0 .../student_batch_wise_attendance.js | 0 .../student_batch_wise_attendance.json | 4 +- .../student_batch_wise_attendance.py | 0 .../report/student_fee_collection/__init__.py | 0 .../student_fee_collection.json | 4 +- .../__init__.py | 0 .../student_monthly_attendance_sheet.js | 2 +- .../student_monthly_attendance_sheet.json | 4 +- .../student_monthly_attendance_sheet.py | 2 +- erpnext/education/setup.py | 28 ++ erpnext/{schools => education}/utils.py | 0 .../web_form/__init__.py | 0 .../web_form/student_applicant}/__init__.py | 0 .../student_applicant/student_applicant.js | 0 .../student_applicant/student_applicant.json | 4 +- .../student_applicant/student_applicant.py | 0 erpnext/healthcare/setup.py | 15 +- erpnext/modules.txt | 2 +- erpnext/patches.txt | 3 +- .../v10_0}/__init__.py | 0 .../v10_0/rename_schools_to_education.py | 32 ++ erpnext/patches/v7_0/make_guardian.py | 12 +- .../v7_0/migrate_schools_to_erpnext.py | 13 +- .../v7_0/rename_examination_to_assessment.py | 10 +- erpnext/patches/v7_0/set_portal_settings.py | 4 +- erpnext/patches/v7_1/set_student_guardian.py | 12 +- erpnext/patches/v7_2/mark_students_active.py | 7 +- .../v7_2/rename_evaluation_criteria.py | 21 +- .../patches/v7_2/update_assessment_modules.py | 17 +- .../update_guardian_name_in_student_master.py | 14 +- .../merge_student_batch_and_student_group.py | 5 +- .../patches/v9_0/copy_old_fees_field_data.py | 4 +- .../student_admission_childtable_migrate.py | 7 +- erpnext/public/build.json | 6 +- erpnext/public/js/setup_wizard.js | 2 +- .../student_leave_application.json | 357 ---------------- .../doctype/student_log/student_log.json | 400 ------------------ .../schools/web_form/discussion/discussion.js | 4 - .../web_form/discussion/discussion.json | 49 --- .../schools/web_form/discussion/discussion.py | 9 - erpnext/setup/setup_wizard/sample_data.py | 6 +- ...school_masters.md => education_masters.md} | 2 +- .../setup_wizard/tasks/school_import_data.md | 2 +- erpnext/setup/utils.py | 15 + erpnext/tests/ui/tests.txt | 54 +-- erpnext/utilities/user_progress.py | 4 +- erpnext/utilities/user_progress_utils.py | 2 +- license.txt | 2 +- 558 files changed, 1687 insertions(+), 1349 deletions(-) rename erpnext/config/{schools.py => education.py} (99%) rename erpnext/demo/data/{item_schools.json => item_education.json} (100%) rename erpnext/demo/user/{schools.py => education.py} (93%) rename erpnext/docs/assets/img/{schools => education}/__init__.py (100%) rename erpnext/docs/assets/img/{schools => education}/admission/__init__.py (100%) rename erpnext/docs/assets/img/{schools => education}/admission/program-enrollment-tool.gif (100%) rename erpnext/docs/assets/img/{schools => education}/admission/program-enrollment-tool01.gif (100%) rename erpnext/docs/assets/img/{schools => education}/admission/program-enrollment.gif (100%) rename erpnext/docs/assets/img/{schools => education}/admission/student-admission.gif (100%) rename erpnext/docs/assets/img/{schools => education}/admission/student-applicant-enroll.png (100%) rename erpnext/docs/assets/img/{schools => education}/admission/student-applicant.png (100%) rename erpnext/docs/assets/img/{schools => education}/admission/student-application-actions.png (100%) rename erpnext/docs/assets/img/{schools => education}/assessment/__init__.py (100%) rename erpnext/docs/assets/img/{schools => education}/assessment/assessment-criteria.png (100%) rename erpnext/docs/assets/img/{schools => education}/assessment/assessment-group-details.png (100%) rename erpnext/docs/assets/img/{schools => education}/assessment/assessment-group-term.png (100%) rename erpnext/docs/assets/img/{schools => education}/assessment/assessment-plan-criteria.png (100%) rename erpnext/docs/assets/img/{schools => education}/assessment/assessment-plan-details.png (100%) rename erpnext/docs/assets/img/{schools => education}/assessment/assessment-result-tool.png (100%) rename erpnext/docs/assets/img/{schools => education}/assessment/assessment-result.png (100%) rename erpnext/docs/assets/img/{schools => education}/assessment/grading-scale.png (100%) rename erpnext/docs/assets/img/{schools => education}/fees/__init__.py (100%) rename erpnext/docs/assets/img/{schools => education}/fees/fee-category.png (100%) rename erpnext/docs/assets/img/{schools => education}/fees/fee-structure.png (100%) rename erpnext/docs/assets/img/{schools => education}/fees/fees-section.png (100%) rename erpnext/docs/assets/img/{schools => education}/fees/fees.png (100%) rename erpnext/docs/assets/img/{schools => education}/home.png (100%) rename erpnext/docs/assets/img/{schools => education}/module.png (100%) rename erpnext/docs/assets/img/{schools => education}/schedule/__init__.py (100%) rename erpnext/docs/assets/img/{schools => education}/schedule/course-schedule-att-1.png (100%) rename erpnext/docs/assets/img/{schools => education}/schedule/course-schedule-att.png (100%) rename erpnext/docs/assets/img/{schools => education}/schedule/course-schedule.png (100%) rename erpnext/docs/assets/img/{schools => education}/schedule/examination.png (100%) rename erpnext/docs/assets/img/{schools => education}/schedule/schedule-section.png (100%) rename erpnext/docs/assets/img/{schools => education}/schedule/scheduling-tool.png (100%) rename erpnext/docs/assets/img/{schools => education}/schedule/student-attendance.gif (100%) rename erpnext/docs/assets/img/{schools => education}/schedule/student-attendance.png (100%) rename erpnext/docs/assets/img/{schools => education}/schedule/student-leave-application.gif (100%) rename erpnext/docs/assets/img/{schools => education}/setup/Course-schedule-error.png (100%) rename erpnext/docs/assets/img/{schools => education}/setup/Room-Assesment-plan.png (100%) rename erpnext/docs/assets/img/{schools => education}/setup/__init__.py (100%) rename erpnext/docs/assets/img/{schools => education}/setup/academic-term.png (100%) rename erpnext/docs/assets/img/{schools => education}/setup/academic-year.png (100%) rename erpnext/docs/assets/img/{schools => education}/setup/course-fee-program.png (100%) rename erpnext/docs/assets/img/{schools => education}/setup/course.png (100%) rename erpnext/docs/assets/img/{schools => education}/setup/instructor.png (100%) rename erpnext/docs/assets/img/{schools => education}/setup/program.png (100%) rename erpnext/docs/assets/img/{schools => education}/setup/room.png (100%) rename erpnext/docs/assets/img/{schools => education}/setup/student-attendance-tool.gif (100%) rename erpnext/docs/assets/img/{schools => education}/setup/student-group-instructor.png (100%) rename erpnext/docs/assets/img/{schools => education}/student/__init__.py (100%) rename erpnext/docs/assets/img/{schools => education}/student/guardian.png (100%) rename erpnext/docs/assets/img/{schools => education}/student/schools-settings.png (100%) rename erpnext/docs/assets/img/{schools => education}/student/student group.gif (100%) rename erpnext/docs/assets/img/{schools => education}/student/student-admission.gif (100%) rename erpnext/docs/assets/img/{schools => education}/student/student-batch-validation.gif (100%) rename erpnext/docs/assets/img/{schools => education}/student/student-batch.gif (100%) rename erpnext/docs/assets/img/{schools => education}/student/student-course-validation.gif (100%) rename erpnext/docs/assets/img/{schools => education}/student/student-group-attendance.gif (100%) rename erpnext/docs/assets/img/{schools => education}/student/student-group-creation-tool.gif (100%) rename erpnext/docs/assets/img/{schools => education}/student/student-log.png (100%) rename erpnext/docs/assets/img/{schools => education}/student/student.png (100%) rename erpnext/docs/user/manual/en/{schools => education}/Assessment/__init__.py (100%) rename erpnext/docs/user/manual/en/{schools => education}/Assessment/assessment_criteria.md (82%) rename erpnext/docs/user/manual/en/{schools => education}/Assessment/assessment_criteria_group.md (100%) rename erpnext/docs/user/manual/en/{schools => education}/Assessment/assessment_group.md (79%) rename erpnext/docs/user/manual/en/{schools => education}/Assessment/assessment_plan.md (81%) rename erpnext/docs/user/manual/en/{schools => education}/Assessment/assessment_result.md (68%) rename erpnext/docs/user/manual/en/{schools => education}/Assessment/assessment_result_tool.md (89%) rename erpnext/docs/user/manual/en/{schools => education}/Assessment/grading_scale.md (83%) rename erpnext/docs/user/manual/en/{schools => education}/Assessment/index.md (100%) rename erpnext/docs/user/manual/en/{schools => education}/Assessment/index.txt (100%) rename erpnext/docs/user/manual/en/{schools => education}/Attendance/__init__.py (100%) rename erpnext/docs/user/manual/en/{schools => education}/Attendance/index.md (100%) rename erpnext/docs/user/manual/en/{schools => education}/Attendance/index.txt (100%) rename erpnext/docs/user/manual/en/{schools => education}/Attendance/student-attendance-tool.md (87%) rename erpnext/docs/user/manual/en/{schools => education}/Attendance/student-attendance.md (92%) rename erpnext/docs/user/manual/en/{schools => education}/Attendance/student-leave-application.md (63%) rename erpnext/docs/user/manual/en/{schools => education}/__init__.py (100%) rename erpnext/docs/user/manual/en/{schools => education}/admission/__init__.py (100%) rename erpnext/docs/user/manual/en/{schools => education}/admission/index.md (100%) rename erpnext/docs/user/manual/en/{schools => education}/admission/index.txt (100%) rename erpnext/docs/user/manual/en/{schools => education}/admission/program-enrollment-tool.md (81%) rename erpnext/docs/user/manual/en/{schools => education}/admission/program-enrollment.md (91%) rename erpnext/docs/user/manual/en/{schools => education}/admission/student-applicant.md (86%) rename erpnext/docs/user/manual/en/{schools => education}/admission/student_admission.md (84%) rename erpnext/docs/user/manual/en/{schools => education}/fees/__init__.py (100%) rename erpnext/docs/user/manual/en/{schools => education}/fees/fee-category.md (75%) rename erpnext/docs/user/manual/en/{schools => education}/fees/fee-structure.md (78%) create mode 100644 erpnext/docs/user/manual/en/education/fees/fees.md rename erpnext/docs/user/manual/en/{schools => education}/fees/index.md (76%) rename erpnext/docs/user/manual/en/{schools => education}/fees/index.txt (100%) create mode 100644 erpnext/docs/user/manual/en/education/index.md rename erpnext/docs/user/manual/en/{schools => education}/index.txt (100%) rename erpnext/docs/user/manual/en/{schools => education}/schedule/__init__.py (100%) rename erpnext/docs/user/manual/en/{schools => education}/schedule/course-schedule.md (84%) rename erpnext/docs/user/manual/en/{schools => education}/schedule/examination.md (80%) rename erpnext/docs/user/manual/en/{schools => education}/schedule/index.md (62%) rename erpnext/docs/user/manual/en/{schools => education}/schedule/index.txt (100%) rename erpnext/docs/user/manual/en/{schools => education}/schedule/scheduling-tool.md (96%) rename erpnext/docs/user/manual/en/{schools => education}/setup/__init__.py (100%) rename erpnext/docs/user/manual/en/{schools => education}/setup/academic-term.md (92%) rename erpnext/docs/user/manual/en/{schools => education}/setup/academic-year.md (61%) rename erpnext/docs/user/manual/en/{schools => education}/setup/course.md (78%) create mode 100644 erpnext/docs/user/manual/en/education/setup/index.md rename erpnext/docs/user/manual/en/{schools => education}/setup/index.txt (84%) rename erpnext/docs/user/manual/en/{schools => education}/setup/instructor.md (65%) rename erpnext/docs/user/manual/en/{schools => education}/setup/program.md (70%) rename erpnext/docs/user/manual/en/{schools => education}/setup/room.md (72%) create mode 100644 erpnext/docs/user/manual/en/education/setup/school-settings.md rename erpnext/docs/user/manual/en/{schools => education}/setup/student-batch-name.md (80%) rename erpnext/docs/user/manual/en/{schools => education}/setup/student-category.md (78%) rename erpnext/docs/user/manual/en/{schools => education}/student/__init__.py (100%) rename erpnext/docs/user/manual/en/{schools => education}/student/guardian.md (68%) rename erpnext/docs/user/manual/en/{schools => education}/student/index.md (100%) rename erpnext/docs/user/manual/en/{schools => education}/student/index.txt (100%) rename erpnext/docs/user/manual/en/{schools => education}/student/student-batch.md (80%) rename erpnext/docs/user/manual/en/{schools => education}/student/student-group-creation-tool.md (82%) rename erpnext/docs/user/manual/en/{schools => education}/student/student-group.md (88%) rename erpnext/docs/user/manual/en/{schools => education}/student/student-log.md (72%) rename erpnext/docs/user/manual/en/{schools => education}/student/student.md (83%) delete mode 100644 erpnext/docs/user/manual/en/schools/fees/fees.md delete mode 100644 erpnext/docs/user/manual/en/schools/index.md delete mode 100644 erpnext/docs/user/manual/en/schools/setup/index.md delete mode 100644 erpnext/docs/user/manual/en/schools/setup/school-settings.md rename erpnext/docs/user/manual/es/{schools => education}/Assessment/__init__.py (100%) rename erpnext/docs/user/manual/es/{schools => education}/Assessment/assessment_criteria.md (85%) rename erpnext/docs/user/manual/es/{schools => education}/Assessment/assessment_group.md (82%) rename erpnext/docs/user/manual/es/{schools => education}/Assessment/assessment_plan.md (84%) rename erpnext/docs/user/manual/es/{schools => education}/Assessment/assessment_result.md (75%) rename erpnext/docs/user/manual/es/{schools => education}/Assessment/assessment_result_tool.md (92%) rename erpnext/docs/user/manual/es/{schools => education}/Assessment/grading_scale.md (87%) rename erpnext/docs/user/manual/es/{schools => education}/Assessment/index.md (100%) rename erpnext/docs/user/manual/es/{schools => education}/Assessment/index.txt (100%) rename erpnext/docs/user/manual/es/{schools => education}/__init__.py (100%) rename erpnext/docs/user/manual/es/{schools => education}/admission/__init__.py (100%) rename erpnext/docs/user/manual/es/{schools => education}/admission/index.md (100%) rename erpnext/docs/user/manual/es/{schools => education}/admission/index.txt (100%) rename erpnext/docs/user/manual/es/{schools => education}/admission/program-enrollment.md (78%) rename erpnext/docs/user/manual/es/{schools => education}/admission/student-applicant.md (89%) rename erpnext/docs/user/manual/es/{schools => education}/fees/__init__.py (100%) rename erpnext/docs/user/manual/es/{schools => education}/fees/fee-category.md (80%) rename erpnext/docs/user/manual/es/{schools => education}/fees/fee-structure.md (83%) create mode 100644 erpnext/docs/user/manual/es/education/fees/fees.md rename erpnext/docs/user/manual/es/{schools => education}/fees/index.md (82%) rename erpnext/docs/user/manual/es/{schools => education}/fees/index.txt (100%) rename erpnext/docs/user/manual/es/{schools => education}/index.md (84%) rename erpnext/docs/user/manual/es/{schools => education}/index.txt (100%) rename erpnext/docs/user/manual/es/{schools => education}/schedule/__init__.py (100%) rename erpnext/docs/user/manual/es/{schools => education}/schedule/course-schedule.md (86%) rename erpnext/docs/user/manual/es/{schools => education}/schedule/examination.md (85%) rename erpnext/docs/user/manual/es/{schools => education}/schedule/index.md (66%) rename erpnext/docs/user/manual/es/{schools => education}/schedule/index.txt (100%) rename erpnext/docs/user/manual/es/{schools => education}/schedule/scheduling-tool.md (96%) rename erpnext/docs/user/manual/es/{schools => education}/schedule/student-attendance.md (83%) rename erpnext/docs/user/manual/es/{schools => education}/setup/__init__.py (100%) rename erpnext/docs/user/manual/es/{schools => education}/setup/academic-term.md (71%) rename erpnext/docs/user/manual/es/{schools => education}/setup/academic-year.md (70%) create mode 100644 erpnext/docs/user/manual/es/education/setup/course.md rename erpnext/docs/user/manual/es/{schools => education}/setup/index.md (72%) rename erpnext/docs/user/manual/es/{schools => education}/setup/index.txt (100%) create mode 100644 erpnext/docs/user/manual/es/education/setup/instructor.md create mode 100644 erpnext/docs/user/manual/es/education/setup/program.md create mode 100644 erpnext/docs/user/manual/es/education/setup/room.md rename erpnext/docs/user/manual/es/{schools => education}/student/__init__.py (100%) rename erpnext/docs/user/manual/es/{schools => education}/student/index.md (100%) rename erpnext/docs/user/manual/es/{schools => education}/student/index.txt (100%) rename erpnext/docs/user/manual/es/{schools => education}/student/student-batch.md (55%) rename erpnext/docs/user/manual/es/{schools => education}/student/student-group-creation-tool.md (77%) rename erpnext/docs/user/manual/es/{schools => education}/student/student-group.md (90%) rename erpnext/docs/user/manual/es/{schools => education}/student/student-log.md (71%) rename erpnext/docs/user/manual/es/{schools => education}/student/student.md (78%) delete mode 100644 erpnext/docs/user/manual/es/schools/fees/fees.md delete mode 100644 erpnext/docs/user/manual/es/schools/setup/course.md delete mode 100644 erpnext/docs/user/manual/es/schools/setup/instructor.md delete mode 100644 erpnext/docs/user/manual/es/schools/setup/program.md delete mode 100644 erpnext/docs/user/manual/es/schools/setup/room.md create mode 100644 erpnext/docs/user/videos/learn/education.md delete mode 100644 erpnext/docs/user/videos/learn/schools.md rename erpnext/{schools => education}/__init__.py (100%) rename erpnext/{schools => education}/api.py (100%) rename erpnext/{schools => education}/doctype/__init__.py (100%) rename erpnext/{schools => education}/doctype/academic_term/__init__.py (100%) rename erpnext/{schools => education}/doctype/academic_term/academic_term.js (100%) rename erpnext/{schools => education}/doctype/academic_term/academic_term.json (98%) rename erpnext/{schools => education}/doctype/academic_term/academic_term.py (100%) rename erpnext/{schools => education}/doctype/academic_term/test_academic_term.js (89%) rename erpnext/{schools => education}/doctype/academic_term/test_academic_term.py (100%) rename erpnext/{schools => education}/doctype/academic_term/test_records.json (100%) rename erpnext/{schools => education}/doctype/academic_year/__init__.py (100%) rename erpnext/{schools => education}/doctype/academic_year/academic_year.js (100%) rename erpnext/{schools => education}/doctype/academic_year/academic_year.json (97%) rename erpnext/{schools => education}/doctype/academic_year/academic_year.py (100%) rename erpnext/{schools => education}/doctype/academic_year/test_academic_year.js (88%) rename erpnext/{schools => education}/doctype/academic_year/test_academic_year.py (100%) rename erpnext/{schools => education}/doctype/academic_year/test_records.json (100%) rename erpnext/{schools => education}/doctype/assessment_criteria/__init__.py (100%) rename erpnext/{schools => education}/doctype/assessment_criteria/assessment_criteria.js (100%) rename erpnext/{schools => education}/doctype/assessment_criteria/assessment_criteria.json (97%) rename erpnext/{schools => education}/doctype/assessment_criteria/assessment_criteria.py (100%) rename erpnext/{schools => education}/doctype/assessment_criteria/test_assessment_criteria.js (83%) rename erpnext/{schools => education}/doctype/assessment_criteria/test_assessment_criteria.py (100%) rename erpnext/{schools => education}/doctype/assessment_criteria/test_records.json (100%) rename erpnext/{schools => education}/doctype/assessment_criteria_group/__init__.py (100%) rename erpnext/{schools => education}/doctype/assessment_criteria_group/assessment_criteria_group.js (100%) rename erpnext/{schools => education}/doctype/assessment_criteria_group/assessment_criteria_group.json (96%) rename erpnext/{schools => education}/doctype/assessment_criteria_group/assessment_criteria_group.py (100%) rename erpnext/{schools => education}/doctype/assessment_criteria_group/test_assessment_criteria_group.js (82%) rename erpnext/{schools => education}/doctype/assessment_criteria_group/test_assessment_criteria_group.py (100%) rename erpnext/{schools => education}/doctype/assessment_group/__init__.py (100%) rename erpnext/{schools => education}/doctype/assessment_group/assessment_group.js (100%) rename erpnext/{schools => education}/doctype/assessment_group/assessment_group.json (98%) rename erpnext/{schools => education}/doctype/assessment_group/assessment_group.py (100%) rename erpnext/{schools => education}/doctype/assessment_group/assessment_group_tree.js (100%) rename erpnext/{schools => education}/doctype/assessment_group/test_assessment_group.js (98%) rename erpnext/{schools => education}/doctype/assessment_group/test_assessment_group.py (100%) rename erpnext/{schools => education}/doctype/assessment_plan/__init__.py (100%) rename erpnext/{schools => education}/doctype/assessment_plan/assessment_plan.js (96%) rename erpnext/{schools => education}/doctype/assessment_plan/assessment_plan.json (99%) rename erpnext/{schools => education}/doctype/assessment_plan/assessment_plan.py (97%) rename erpnext/{schools => education}/doctype/assessment_plan/test_assessment_plan.js (96%) rename erpnext/{schools => education}/doctype/assessment_plan/test_assessment_plan.py (100%) rename erpnext/{schools => education}/doctype/assessment_plan_criteria/__init__.py (100%) rename erpnext/{schools => education}/doctype/assessment_plan_criteria/assessment_plan_criteria.json (97%) rename erpnext/{schools => education}/doctype/assessment_plan_criteria/assessment_plan_criteria.py (100%) rename erpnext/{schools => education}/doctype/assessment_result/__init__.py (100%) rename erpnext/{schools => education}/doctype/assessment_result/assessment_result.js (92%) rename erpnext/{schools => education}/doctype/assessment_result/assessment_result.json (99%) rename erpnext/{schools => education}/doctype/assessment_result/assessment_result.py (94%) rename erpnext/{schools => education}/doctype/assessment_result/test_assessment_result.js (95%) rename erpnext/{schools => education}/doctype/assessment_result/test_assessment_result.py (91%) rename erpnext/{schools => education}/doctype/assessment_result_detail/__init__.py (100%) rename erpnext/{schools => education}/doctype/assessment_result_detail/assessment_result_detail.json (98%) rename erpnext/{schools => education}/doctype/assessment_result_detail/assessment_result_detail.py (100%) rename erpnext/{schools => education}/doctype/assessment_result_tool/__init__.py (100%) rename erpnext/{schools => education}/doctype/assessment_result_tool/assessment_result_tool.js (94%) rename erpnext/{schools => education}/doctype/assessment_result_tool/assessment_result_tool.json (98%) rename erpnext/{schools => education}/doctype/assessment_result_tool/assessment_result_tool.py (100%) rename erpnext/{schools => education}/doctype/assessment_result_tool/test_assessment_result_tool.js (93%) create mode 100644 erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.py rename erpnext/{schools => education}/doctype/course/__init__.py (100%) rename erpnext/{schools => education}/doctype/course/course.js (100%) rename erpnext/{schools => education}/doctype/course/course.json (99%) rename erpnext/{schools => education}/doctype/course/course.py (100%) rename erpnext/{schools => education}/doctype/course/test_course.js (94%) rename erpnext/{schools => education}/doctype/course/test_course.py (100%) rename erpnext/{schools => education}/doctype/course/test_records.json (100%) rename erpnext/{schools => education}/doctype/course_assessment_criteria/__init__.py (100%) rename erpnext/{schools => education}/doctype/course_assessment_criteria/course_assessment_criteria.json (97%) rename erpnext/{schools => education}/doctype/course_assessment_criteria/course_assessment_criteria.py (100%) rename erpnext/{schools => education}/doctype/course_schedule/__init__.py (100%) rename erpnext/{schools => education}/doctype/course_schedule/course_schedule.js (92%) rename erpnext/{schools => education}/doctype/course_schedule/course_schedule.json (99%) rename erpnext/{schools => education}/doctype/course_schedule/course_schedule.py (96%) rename erpnext/{schools => education}/doctype/course_schedule/course_schedule_calendar.js (91%) create mode 100644 erpnext/education/doctype/course_schedule/test_course_schedule.js rename erpnext/{schools => education}/doctype/course_schedule/test_course_schedule.py (98%) rename erpnext/{schools => education}/doctype/course_scheduling_tool/__init__.py (100%) rename erpnext/{schools => education}/doctype/course_scheduling_tool/course_scheduling_tool.js (100%) rename erpnext/{schools => education}/doctype/course_scheduling_tool/course_scheduling_tool.json (99%) rename erpnext/{schools => education}/doctype/course_scheduling_tool/course_scheduling_tool.py (98%) create mode 100644 erpnext/education/doctype/course_scheduling_tool/test_course_scheduling_tool.js create mode 100644 erpnext/education/doctype/course_scheduling_tool/test_course_scheduling_tool.py rename erpnext/{schools/doctype/fee_category => education/doctype/education_settings}/__init__.py (100%) rename erpnext/{schools/doctype/school_settings/school_settings.js => education/doctype/education_settings/education_settings.js} (78%) rename erpnext/{schools/doctype/school_settings/school_settings.json => education/doctype/education_settings/education_settings.json} (98%) rename erpnext/{schools/doctype/school_settings/school_settings.py => education/doctype/education_settings/education_settings.py} (85%) rename erpnext/{schools/doctype/school_settings/test_school_settings.js => education/doctype/education_settings/test_education_settings.js} (64%) create mode 100644 erpnext/education/doctype/education_settings/test_education_settings.py rename erpnext/{schools/doctype/fee_component => education/doctype/fee_category}/__init__.py (100%) rename erpnext/{schools => education}/doctype/fee_category/fee_category.js (100%) rename erpnext/{schools => education}/doctype/fee_category/fee_category.json (98%) rename erpnext/{schools => education}/doctype/fee_category/fee_category.py (100%) create mode 100644 erpnext/education/doctype/fee_category/test_fee_category.js rename erpnext/{schools => education}/doctype/fee_category/test_fee_category.py (100%) rename erpnext/{schools => education}/doctype/fee_category/test_records.json (100%) rename erpnext/{schools/doctype/fee_schedule => education/doctype/fee_component}/__init__.py (100%) rename erpnext/{schools => education}/doctype/fee_component/fee_component.json (98%) rename erpnext/{schools => education}/doctype/fee_component/fee_component.py (100%) rename erpnext/{schools/doctype/fee_schedule_program => education/doctype/fee_schedule}/__init__.py (100%) rename erpnext/{schools => education}/doctype/fee_schedule/fee_schedule.js (95%) rename erpnext/{schools => education}/doctype/fee_schedule/fee_schedule.json (99%) rename erpnext/{schools => education}/doctype/fee_schedule/fee_schedule.py (100%) rename erpnext/{schools => education}/doctype/fee_schedule/fee_schedule_list.js (100%) rename erpnext/{schools => education}/doctype/fee_schedule/test_fee_schedule.js (100%) rename erpnext/{schools => education}/doctype/fee_schedule/test_fee_schedule.py (100%) rename erpnext/{schools/doctype/fee_schedule_student_group => education/doctype/fee_schedule_program}/__init__.py (100%) rename erpnext/{schools => education}/doctype/fee_schedule_program/fee_schedule_program.json (97%) rename erpnext/{schools => education}/doctype/fee_schedule_program/fee_schedule_program.py (100%) rename erpnext/{schools/doctype/fee_structure => education/doctype/fee_schedule_student_group}/__init__.py (100%) rename erpnext/{schools => education}/doctype/fee_schedule_student_group/fee_schedule_student_group.json (96%) rename erpnext/{schools => education}/doctype/fee_schedule_student_group/fee_schedule_student_group.py (100%) rename erpnext/{schools/doctype/fees => education/doctype/fee_structure}/__init__.py (100%) rename erpnext/{schools => education}/doctype/fee_structure/fee_structure.js (93%) rename erpnext/{schools => education}/doctype/fee_structure/fee_structure.json (99%) rename erpnext/{schools => education}/doctype/fee_structure/fee_structure.py (100%) rename erpnext/{schools => education}/doctype/fee_structure/test_fee_structure.js (100%) rename erpnext/{schools => education}/doctype/fee_structure/test_fee_structure.py (100%) rename erpnext/{schools => education}/doctype/fee_structure/test_records.json (100%) rename erpnext/{schools/doctype/grading_scale => education/doctype/fees}/__init__.py (100%) rename erpnext/{schools => education}/doctype/fees/fees.js (97%) rename erpnext/{schools => education}/doctype/fees/fees.json (99%) rename erpnext/{schools => education}/doctype/fees/fees.py (100%) rename erpnext/{schools => education}/doctype/fees/fees_list.js (100%) rename erpnext/{schools => education}/doctype/fees/test_fees.js (100%) rename erpnext/{schools => education}/doctype/fees/test_fees.py (100%) rename erpnext/{schools/doctype/grading_scale_interval => education/doctype/grading_scale}/__init__.py (100%) rename erpnext/{schools => education}/doctype/grading_scale/grading_scale.js (100%) rename erpnext/{schools => education}/doctype/grading_scale/grading_scale.json (98%) rename erpnext/{schools => education}/doctype/grading_scale/grading_scale.py (100%) rename erpnext/{schools => education}/doctype/grading_scale/test_grading_scale.js (97%) rename erpnext/{schools => education}/doctype/grading_scale/test_grading_scale.py (100%) rename erpnext/{schools => education}/doctype/grading_scale/test_records.json (100%) rename erpnext/{schools/doctype/guardian => education/doctype/grading_scale_interval}/__init__.py (100%) rename erpnext/{schools => education}/doctype/grading_scale_interval/grading_scale_interval.json (97%) rename erpnext/{schools => education}/doctype/grading_scale_interval/grading_scale_interval.py (100%) rename erpnext/{schools/doctype/guardian_interest => education/doctype/guardian}/__init__.py (100%) rename erpnext/{schools => education}/doctype/guardian/guardian.js (100%) rename erpnext/{schools => education}/doctype/guardian/guardian.json (99%) rename erpnext/{schools => education}/doctype/guardian/guardian.py (100%) rename erpnext/{schools => education}/doctype/guardian/test_guardian.js (93%) rename erpnext/{schools => education}/doctype/guardian/test_guardian.py (100%) rename erpnext/{schools/doctype/guardian_student => education/doctype/guardian_interest}/__init__.py (100%) rename erpnext/{schools => education}/doctype/guardian_interest/guardian_interest.json (95%) rename erpnext/{schools => education}/doctype/guardian_interest/guardian_interest.py (100%) rename erpnext/{schools/doctype/instructor => education/doctype/guardian_student}/__init__.py (100%) rename erpnext/{schools => education}/doctype/guardian_student/guardian_student.json (97%) rename erpnext/{schools => education}/doctype/guardian_student/guardian_student.py (100%) rename erpnext/{schools/doctype/program => education/doctype/instructor}/__init__.py (100%) rename erpnext/{schools => education}/doctype/instructor/instructor.js (100%) rename erpnext/{schools => education}/doctype/instructor/instructor.json (98%) rename erpnext/{schools => education}/doctype/instructor/instructor.py (79%) rename erpnext/{schools => education}/doctype/instructor/test_instructor.js (86%) rename erpnext/{schools => education}/doctype/instructor/test_instructor.py (100%) rename erpnext/{schools => education}/doctype/instructor/test_records.json (100%) rename erpnext/{schools/doctype/program_course => education/doctype/program}/__init__.py (100%) rename erpnext/{schools => education}/doctype/program/program.js (100%) rename erpnext/{schools => education}/doctype/program/program.json (98%) rename erpnext/{schools => education}/doctype/program/program.py (100%) rename erpnext/{schools => education}/doctype/program/test_program.js (92%) rename erpnext/{schools => education}/doctype/program/test_program.py (100%) rename erpnext/{schools => education}/doctype/program/test_records.json (100%) rename erpnext/{schools/doctype/program_enrollment => education/doctype/program_course}/__init__.py (100%) rename erpnext/{schools => education}/doctype/program_course/program_course.json (98%) rename erpnext/{schools => education}/doctype/program_course/program_course.py (100%) rename erpnext/{schools/doctype/program_enrollment_course => education/doctype/program_enrollment}/__init__.py (100%) rename erpnext/{schools => education}/doctype/program_enrollment/program_enrollment.js (87%) rename erpnext/{schools => education}/doctype/program_enrollment/program_enrollment.json (98%) rename erpnext/{schools => education}/doctype/program_enrollment/program_enrollment.py (98%) create mode 100644 erpnext/education/doctype/program_enrollment/test_program_enrollment.js rename erpnext/{schools => education}/doctype/program_enrollment/test_program_enrollment.py (100%) rename erpnext/{schools/doctype/program_enrollment_fee => education/doctype/program_enrollment_course}/__init__.py (100%) rename erpnext/{schools => education}/doctype/program_enrollment_course/program_enrollment_course.json (96%) rename erpnext/{schools => education}/doctype/program_enrollment_course/program_enrollment_course.py (100%) rename erpnext/{schools/doctype/program_enrollment_tool => education/doctype/program_enrollment_fee}/__init__.py (100%) rename erpnext/{schools => education}/doctype/program_enrollment_fee/program_enrollment_fee.json (98%) rename erpnext/{schools => education}/doctype/program_enrollment_fee/program_enrollment_fee.py (100%) rename erpnext/{schools/doctype/program_enrollment_tool_student => education/doctype/program_enrollment_tool}/__init__.py (100%) rename erpnext/{schools => education}/doctype/program_enrollment_tool/program_enrollment_tool.js (100%) rename erpnext/{schools => education}/doctype/program_enrollment_tool/program_enrollment_tool.json (99%) rename erpnext/{schools => education}/doctype/program_enrollment_tool/program_enrollment_tool.py (97%) create mode 100644 erpnext/education/doctype/program_enrollment_tool/test_program_enrollment_tool.js create mode 100644 erpnext/education/doctype/program_enrollment_tool/test_program_enrollment_tool.py rename erpnext/{schools/doctype/program_fee => education/doctype/program_enrollment_tool_student}/__init__.py (100%) rename erpnext/{schools => education}/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json (98%) rename erpnext/{schools => education}/doctype/program_enrollment_tool_student/program_enrollment_tool_student.py (100%) rename erpnext/{schools/doctype/room => education/doctype/program_fee}/__init__.py (100%) rename erpnext/{schools => education}/doctype/program_fee/program_fee.json (98%) rename erpnext/{schools => education}/doctype/program_fee/program_fee.py (100%) rename erpnext/{schools/doctype/school_house => education/doctype/room}/__init__.py (100%) rename erpnext/{schools => education}/doctype/room/room.js (100%) rename erpnext/{schools => education}/doctype/room/room.json (97%) rename erpnext/{schools => education}/doctype/room/room.py (100%) rename erpnext/{schools => education}/doctype/room/test_records.json (100%) rename erpnext/{schools => education}/doctype/room/test_room.js (87%) rename erpnext/{schools => education}/doctype/room/test_room.py (100%) rename erpnext/{schools/doctype/school_settings => education/doctype/school_house}/__init__.py (100%) rename erpnext/{schools => education}/doctype/school_house/school_house.js (100%) rename erpnext/{schools => education}/doctype/school_house/school_house.json (96%) rename erpnext/{schools => education}/doctype/school_house/school_house.py (100%) create mode 100644 erpnext/education/doctype/school_house/test_school_house.js rename erpnext/{schools => education}/doctype/school_house/test_school_house.py (100%) rename erpnext/{schools => education}/doctype/student/__init__.py (100%) rename erpnext/{schools => education}/doctype/student/student.js (100%) rename erpnext/{schools => education}/doctype/student/student.json (99%) rename erpnext/{schools => education}/doctype/student/student.py (100%) rename erpnext/{schools => education}/doctype/student/student_dashboard.py (100%) rename erpnext/{schools => education}/doctype/student/student_list.js (100%) rename erpnext/{schools => education}/doctype/student/test_records.json (100%) create mode 100644 erpnext/education/doctype/student/test_student.js rename erpnext/{schools => education}/doctype/student/test_student.py (100%) rename erpnext/{schools => education}/doctype/student_admission/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_admission/student_admission.js (100%) rename erpnext/{schools => education}/doctype/student_admission/student_admission.json (99%) rename erpnext/{schools => education}/doctype/student_admission/student_admission.py (93%) rename erpnext/{schools => education}/doctype/student_admission/templates/student_admission.html (100%) rename erpnext/{schools => education}/doctype/student_admission/templates/student_admission_row.html (100%) rename erpnext/{schools => education}/doctype/student_admission/test_student_admission.js (95%) rename erpnext/{schools => education}/doctype/student_admission/test_student_admission.py (100%) rename erpnext/{schools => education}/doctype/student_admission_program/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_admission_program/student_admission_program.json (98%) rename erpnext/{schools => education}/doctype/student_admission_program/student_admission_program.py (100%) rename erpnext/{schools => education}/doctype/student_applicant/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_applicant/student_applicant.js (96%) rename erpnext/{schools => education}/doctype/student_applicant/student_applicant.json (99%) rename erpnext/{schools => education}/doctype/student_applicant/student_applicant.py (100%) rename erpnext/{schools => education}/doctype/student_applicant/student_applicant_list.js (100%) rename erpnext/{schools => education}/doctype/student_applicant/test_student_applicant.py (100%) rename erpnext/{schools => education}/doctype/student_applicant/tests/test_student_applicant.js (98%) rename erpnext/{schools => education}/doctype/student_applicant/tests/test_student_applicant_dummy_data.js (100%) rename erpnext/{schools => education}/doctype/student_applicant/tests/test_student_applicant_options.js (98%) rename erpnext/{schools => education}/doctype/student_attendance/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_attendance/student_attendance.js (100%) rename erpnext/{schools => education}/doctype/student_attendance/student_attendance.json (98%) rename erpnext/{schools => education}/doctype/student_attendance/student_attendance.py (97%) rename erpnext/{schools => education}/doctype/student_attendance/student_attendance_list.js (100%) rename erpnext/{schools => education}/doctype/student_attendance/test_student_attendance.js (92%) rename erpnext/{schools => education}/doctype/student_attendance/test_student_attendance.py (100%) rename erpnext/{schools => education}/doctype/student_attendance_tool/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_attendance_tool/student_attendance_tool.js (93%) rename erpnext/{schools => education}/doctype/student_attendance_tool/student_attendance_tool.json (99%) rename erpnext/{schools => education}/doctype/student_attendance_tool/student_attendance_tool.py (100%) rename erpnext/{schools => education}/doctype/student_attendance_tool/test_student_attendance_tool.js (97%) create mode 100644 erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.py rename erpnext/{schools => education}/doctype/student_batch_name/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_batch_name/student_batch_name.js (100%) rename erpnext/{schools => education}/doctype/student_batch_name/student_batch_name.json (96%) rename erpnext/{schools => education}/doctype/student_batch_name/student_batch_name.py (100%) rename erpnext/{schools => education}/doctype/student_batch_name/test_records.json (100%) rename erpnext/{schools => education}/doctype/student_batch_name/test_student_batch_name.js (83%) rename erpnext/{schools => education}/doctype/student_batch_name/test_student_batch_name.py (100%) rename erpnext/{schools => education}/doctype/student_category/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_category/student_category.js (100%) rename erpnext/{schools => education}/doctype/student_category/student_category.json (96%) rename erpnext/{schools => education}/doctype/student_category/student_category.py (100%) rename erpnext/{schools => education}/doctype/student_category/test_student_category.js (84%) rename erpnext/{schools => education}/doctype/student_category/test_student_category.py (100%) rename erpnext/{schools => education}/doctype/student_group/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_group/student_group.js (93%) rename erpnext/{schools => education}/doctype/student_group/student_group.json (99%) rename erpnext/{schools => education}/doctype/student_group/student_group.py (98%) rename erpnext/{schools => education}/doctype/student_group/test_records.json (100%) rename erpnext/{schools => education}/doctype/student_group/test_student_group.js (95%) rename erpnext/{schools => education}/doctype/student_group/test_student_group.py (100%) rename erpnext/{schools => education}/doctype/student_group_creation_tool/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_group_creation_tool/student_group_creation_tool.js (100%) rename erpnext/{schools => education}/doctype/student_group_creation_tool/student_group_creation_tool.json (98%) rename erpnext/{schools => education}/doctype/student_group_creation_tool/student_group_creation_tool.py (95%) rename erpnext/{schools => education}/doctype/student_group_creation_tool/test_student_group_creation_tool.js (98%) create mode 100644 erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.py rename erpnext/{schools => education}/doctype/student_group_creation_tool_course/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json (98%) rename erpnext/{schools => education}/doctype/student_group_creation_tool_course/student_group_creation_tool_course.py (100%) rename erpnext/{schools => education}/doctype/student_group_instructor/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_group_instructor/student_group_instructor.json (94%) rename erpnext/{schools => education}/doctype/student_group_instructor/student_group_instructor.py (100%) rename erpnext/{schools => education}/doctype/student_group_student/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_group_student/student_group_student.json (95%) rename erpnext/{schools => education}/doctype/student_group_student/student_group_student.py (100%) rename erpnext/{schools => education}/doctype/student_guardian/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_guardian/student_guardian.json (93%) rename erpnext/{schools => education}/doctype/student_guardian/student_guardian.py (100%) rename erpnext/{schools => education}/doctype/student_language/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_language/student_language.js (100%) rename erpnext/{schools => education}/doctype/student_language/student_language.json (91%) rename erpnext/{schools => education}/doctype/student_language/student_language.py (100%) create mode 100644 erpnext/education/doctype/student_language/test_student_language.js rename erpnext/{schools => education}/doctype/student_language/test_student_language.py (100%) rename erpnext/{schools => education}/doctype/student_leave_application/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_leave_application/student_leave_application.js (100%) create mode 100644 erpnext/education/doctype/student_leave_application/student_leave_application.json rename erpnext/{schools => education}/doctype/student_leave_application/student_leave_application.py (100%) rename erpnext/{schools => education}/doctype/student_leave_application/test_student_leave_application.js (96%) rename erpnext/{schools => education}/doctype/student_leave_application/test_student_leave_application.py (100%) rename erpnext/{schools => education}/doctype/student_log/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_log/student_log.js (100%) create mode 100644 erpnext/education/doctype/student_log/student_log.json rename erpnext/{schools => education}/doctype/student_log/student_log.py (100%) rename erpnext/{schools => education}/doctype/student_log/test_student_log.js (94%) rename erpnext/{schools => education}/doctype/student_log/test_student_log.py (100%) rename erpnext/{schools => education}/doctype/student_sibling/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_sibling/student_sibling.json (95%) rename erpnext/{schools => education}/doctype/student_sibling/student_sibling.py (100%) rename erpnext/{schools => education}/doctype/student_siblings/__init__.py (100%) rename erpnext/{schools => education}/doctype/student_siblings/student_siblings.json (81%) rename erpnext/{schools => education}/doctype/student_siblings/student_siblings.py (100%) rename erpnext/{schools => education}/report/__init__.py (100%) rename erpnext/{schools => education}/report/absent_student_report/__init__.py (100%) rename erpnext/{schools => education}/report/absent_student_report/absent_student_report.js (100%) rename erpnext/{schools => education}/report/absent_student_report/absent_student_report.json (86%) rename erpnext/{schools => education}/report/absent_student_report/absent_student_report.py (100%) rename erpnext/{schools => education}/report/course_wise_assessment_report/__init__.py (100%) rename erpnext/{schools => education}/report/course_wise_assessment_report/course_wise_assessment_report.html (100%) rename erpnext/{schools => education}/report/course_wise_assessment_report/course_wise_assessment_report.js (100%) rename erpnext/{schools => education}/report/course_wise_assessment_report/course_wise_assessment_report.json (87%) rename erpnext/{schools => education}/report/course_wise_assessment_report/course_wise_assessment_report.py (99%) rename erpnext/{schools => education}/report/student_and_guardian_contact_details/__init__.py (100%) rename erpnext/{schools => education}/report/student_and_guardian_contact_details/student_and_guardian_contact_details.js (100%) rename erpnext/{schools => education}/report/student_and_guardian_contact_details/student_and_guardian_contact_details.json (88%) rename erpnext/{schools => education}/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py (100%) rename erpnext/{schools => education}/report/student_batch_wise_attendance/__init__.py (100%) rename erpnext/{schools => education}/report/student_batch_wise_attendance/student_batch_wise_attendance.js (100%) rename erpnext/{schools => education}/report/student_batch_wise_attendance/student_batch_wise_attendance.json (87%) rename erpnext/{schools => education}/report/student_batch_wise_attendance/student_batch_wise_attendance.py (100%) rename erpnext/{schools => education}/report/student_fee_collection/__init__.py (100%) rename erpnext/{schools => education}/report/student_fee_collection/student_fee_collection.json (91%) rename erpnext/{schools => education}/report/student_monthly_attendance_sheet/__init__.py (100%) rename erpnext/{schools => education}/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js (89%) rename erpnext/{schools => education}/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json (87%) rename erpnext/{schools => education}/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py (98%) create mode 100644 erpnext/education/setup.py rename erpnext/{schools => education}/utils.py (100%) rename erpnext/{schools => education}/web_form/__init__.py (100%) rename erpnext/{schools/web_form/discussion => education/web_form/student_applicant}/__init__.py (100%) rename erpnext/{schools => education}/web_form/student_applicant/student_applicant.js (100%) rename erpnext/{schools => education}/web_form/student_applicant/student_applicant.json (98%) rename erpnext/{schools => education}/web_form/student_applicant/student_applicant.py (100%) rename erpnext/{schools/web_form/student_applicant => patches/v10_0}/__init__.py (100%) create mode 100644 erpnext/patches/v10_0/rename_schools_to_education.py delete mode 100644 erpnext/schools/doctype/student_leave_application/student_leave_application.json delete mode 100644 erpnext/schools/doctype/student_log/student_log.json delete mode 100644 erpnext/schools/web_form/discussion/discussion.js delete mode 100644 erpnext/schools/web_form/discussion/discussion.json delete mode 100644 erpnext/schools/web_form/discussion/discussion.py rename erpnext/setup/setup_wizard/tasks/{school_masters.md => education_masters.md} (75%) diff --git a/.eslintrc b/.eslintrc index 4dd12168534..c9a1b0365bf 100644 --- a/.eslintrc +++ b/.eslintrc @@ -52,6 +52,7 @@ "frappe": true, "erpnext": true, "schools": true, + "education": true, "$": true, "jQuery": true, diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py index ce6c0c3f43f..f30860a3e2b 100644 --- a/erpnext/config/desktop.py +++ b/erpnext/config/desktop.py @@ -194,12 +194,12 @@ def get_data(): "type": "list" }, { - "module_name": "Student Attendance", - "color": "#3aacba", + "module_name": "Student Attendance Tool", + "color": "#C0392B", "icon": "octicon octicon-checklist", - "label": _("Student Attendance"), - "link": "List/Student Attendance", - "_doctype": "Student Attendance", + "label": _("Student Attendance Tool"), + "link": "List/Student Attendance Tool", + "_doctype": "Student Attendance Tool", "type": "list" }, { @@ -257,11 +257,11 @@ def get_data(): "type": "list" }, { - "module_name": "Schools", - "color": "#DE2B37", + "module_name": "Education", + "color": "#428B46", "icon": "octicon octicon-mortar-board", "type": "module", - "label": _("Schools") + "label": _("Education") }, { "module_name": "Healthcare", diff --git a/erpnext/config/schools.py b/erpnext/config/education.py similarity index 99% rename from erpnext/config/schools.py rename to erpnext/config/education.py index 1e7d1b035bb..08846a202a7 100644 --- a/erpnext/config/schools.py +++ b/erpnext/config/education.py @@ -217,7 +217,7 @@ def get_data(): }, { "type": "doctype", - "name": "School Settings" + "name": "Education Settings" } ] }, diff --git a/erpnext/demo/data/item_schools.json b/erpnext/demo/data/item_education.json similarity index 100% rename from erpnext/demo/data/item_schools.json rename to erpnext/demo/data/item_education.json diff --git a/erpnext/demo/demo.py b/erpnext/demo/demo.py index 35256b580fa..42ef8963bc9 100644 --- a/erpnext/demo/demo.py +++ b/erpnext/demo/demo.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import frappe, sys import erpnext import frappe.utils -from erpnext.demo.user import hr, sales, purchase, manufacturing, stock, accounts, projects, fixed_asset, schools +from erpnext.demo.user import hr, sales, purchase, manufacturing, stock, accounts, projects, fixed_asset, education from erpnext.demo.setup import education, manufacture, setup_data, healthcare """ Make a demo @@ -83,7 +83,7 @@ def simulate(domain='Manufacturing', days=100): sales.work() manufacturing.work() elif domain=='Education': - schools.work() + education.work() except: frappe.db.set_global('demo_last_date', current_date) diff --git a/erpnext/demo/setup/education.py b/erpnext/demo/setup/education.py index a124ee7b643..2a894f79d10 100644 --- a/erpnext/demo/setup/education.py +++ b/erpnext/demo/setup/education.py @@ -31,7 +31,7 @@ def make_masters(): frappe.db.commit() def setup_item(): - items = json.loads(open(frappe.get_app_path('erpnext', 'demo', 'data', 'item_schools.json')).read()) + items = json.loads(open(frappe.get_app_path('erpnext', 'demo', 'data', 'item_education.json')).read()) for i in items: item = frappe.new_doc('Item') item.update(i) diff --git a/erpnext/demo/setup/setup_data.py b/erpnext/demo/setup/setup_data.py index d395493c470..c7babc00249 100644 --- a/erpnext/demo/setup/setup_data.py +++ b/erpnext/demo/setup/setup_data.py @@ -229,10 +229,10 @@ def setup_user_roles(): user.add_roles('HR User', 'Projects User') frappe.db.set_global('demo_projects_user', user.name) - if not frappe.db.get_global('demo_schools_user'): + if not frappe.db.get_global('demo_education_user'): user = frappe.get_doc('User', 'aromn@example.com') user.add_roles('Academics User') - frappe.db.set_global('demo_schools_user', user.name) + frappe.db.set_global('demo_education_user', user.name) #Add Expense Approver user = frappe.get_doc('User', 'WanMai@example.com') diff --git a/erpnext/demo/user/schools.py b/erpnext/demo/user/education.py similarity index 93% rename from erpnext/demo/user/schools.py rename to erpnext/demo/user/education.py index 422c31a9d83..8c82f879ab7 100644 --- a/erpnext/demo/user/schools.py +++ b/erpnext/demo/user/education.py @@ -1,3 +1,4 @@ + # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt @@ -8,13 +9,12 @@ import random from frappe.utils import cstr from frappe.utils.make_random import get_random from datetime import timedelta -from erpnext.schools.api import get_student_group_students, make_attendance_records, enroll_student, \ +from erpnext.education.api import get_student_group_students, make_attendance_records, enroll_student, \ get_fee_schedule, collect_fees, get_course -from erpnext.schools.doctype.program_enrollment.program_enrollment import get_program_courses -from erpnext.schools.doctype.student_group.student_group import get_students + def work(): - frappe.set_user(frappe.db.get_global('demo_schools_user')) + frappe.set_user(frappe.db.get_global('demo_education_user')) for d in xrange(20): approve_random_student_applicant() enroll_random_student(frappe.flags.current_date) diff --git a/erpnext/docs/assets/img/schools/__init__.py b/erpnext/docs/assets/img/education/__init__.py similarity index 100% rename from erpnext/docs/assets/img/schools/__init__.py rename to erpnext/docs/assets/img/education/__init__.py diff --git a/erpnext/docs/assets/img/schools/admission/__init__.py b/erpnext/docs/assets/img/education/admission/__init__.py similarity index 100% rename from erpnext/docs/assets/img/schools/admission/__init__.py rename to erpnext/docs/assets/img/education/admission/__init__.py diff --git a/erpnext/docs/assets/img/schools/admission/program-enrollment-tool.gif b/erpnext/docs/assets/img/education/admission/program-enrollment-tool.gif similarity index 100% rename from erpnext/docs/assets/img/schools/admission/program-enrollment-tool.gif rename to erpnext/docs/assets/img/education/admission/program-enrollment-tool.gif diff --git a/erpnext/docs/assets/img/schools/admission/program-enrollment-tool01.gif b/erpnext/docs/assets/img/education/admission/program-enrollment-tool01.gif similarity index 100% rename from erpnext/docs/assets/img/schools/admission/program-enrollment-tool01.gif rename to erpnext/docs/assets/img/education/admission/program-enrollment-tool01.gif diff --git a/erpnext/docs/assets/img/schools/admission/program-enrollment.gif b/erpnext/docs/assets/img/education/admission/program-enrollment.gif similarity index 100% rename from erpnext/docs/assets/img/schools/admission/program-enrollment.gif rename to erpnext/docs/assets/img/education/admission/program-enrollment.gif diff --git a/erpnext/docs/assets/img/schools/admission/student-admission.gif b/erpnext/docs/assets/img/education/admission/student-admission.gif similarity index 100% rename from erpnext/docs/assets/img/schools/admission/student-admission.gif rename to erpnext/docs/assets/img/education/admission/student-admission.gif diff --git a/erpnext/docs/assets/img/schools/admission/student-applicant-enroll.png b/erpnext/docs/assets/img/education/admission/student-applicant-enroll.png similarity index 100% rename from erpnext/docs/assets/img/schools/admission/student-applicant-enroll.png rename to erpnext/docs/assets/img/education/admission/student-applicant-enroll.png diff --git a/erpnext/docs/assets/img/schools/admission/student-applicant.png b/erpnext/docs/assets/img/education/admission/student-applicant.png similarity index 100% rename from erpnext/docs/assets/img/schools/admission/student-applicant.png rename to erpnext/docs/assets/img/education/admission/student-applicant.png diff --git a/erpnext/docs/assets/img/schools/admission/student-application-actions.png b/erpnext/docs/assets/img/education/admission/student-application-actions.png similarity index 100% rename from erpnext/docs/assets/img/schools/admission/student-application-actions.png rename to erpnext/docs/assets/img/education/admission/student-application-actions.png diff --git a/erpnext/docs/assets/img/schools/assessment/__init__.py b/erpnext/docs/assets/img/education/assessment/__init__.py similarity index 100% rename from erpnext/docs/assets/img/schools/assessment/__init__.py rename to erpnext/docs/assets/img/education/assessment/__init__.py diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-criteria.png b/erpnext/docs/assets/img/education/assessment/assessment-criteria.png similarity index 100% rename from erpnext/docs/assets/img/schools/assessment/assessment-criteria.png rename to erpnext/docs/assets/img/education/assessment/assessment-criteria.png diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-group-details.png b/erpnext/docs/assets/img/education/assessment/assessment-group-details.png similarity index 100% rename from erpnext/docs/assets/img/schools/assessment/assessment-group-details.png rename to erpnext/docs/assets/img/education/assessment/assessment-group-details.png diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-group-term.png b/erpnext/docs/assets/img/education/assessment/assessment-group-term.png similarity index 100% rename from erpnext/docs/assets/img/schools/assessment/assessment-group-term.png rename to erpnext/docs/assets/img/education/assessment/assessment-group-term.png diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-plan-criteria.png b/erpnext/docs/assets/img/education/assessment/assessment-plan-criteria.png similarity index 100% rename from erpnext/docs/assets/img/schools/assessment/assessment-plan-criteria.png rename to erpnext/docs/assets/img/education/assessment/assessment-plan-criteria.png diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-plan-details.png b/erpnext/docs/assets/img/education/assessment/assessment-plan-details.png similarity index 100% rename from erpnext/docs/assets/img/schools/assessment/assessment-plan-details.png rename to erpnext/docs/assets/img/education/assessment/assessment-plan-details.png diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-result-tool.png b/erpnext/docs/assets/img/education/assessment/assessment-result-tool.png similarity index 100% rename from erpnext/docs/assets/img/schools/assessment/assessment-result-tool.png rename to erpnext/docs/assets/img/education/assessment/assessment-result-tool.png diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-result.png b/erpnext/docs/assets/img/education/assessment/assessment-result.png similarity index 100% rename from erpnext/docs/assets/img/schools/assessment/assessment-result.png rename to erpnext/docs/assets/img/education/assessment/assessment-result.png diff --git a/erpnext/docs/assets/img/schools/assessment/grading-scale.png b/erpnext/docs/assets/img/education/assessment/grading-scale.png similarity index 100% rename from erpnext/docs/assets/img/schools/assessment/grading-scale.png rename to erpnext/docs/assets/img/education/assessment/grading-scale.png diff --git a/erpnext/docs/assets/img/schools/fees/__init__.py b/erpnext/docs/assets/img/education/fees/__init__.py similarity index 100% rename from erpnext/docs/assets/img/schools/fees/__init__.py rename to erpnext/docs/assets/img/education/fees/__init__.py diff --git a/erpnext/docs/assets/img/schools/fees/fee-category.png b/erpnext/docs/assets/img/education/fees/fee-category.png similarity index 100% rename from erpnext/docs/assets/img/schools/fees/fee-category.png rename to erpnext/docs/assets/img/education/fees/fee-category.png diff --git a/erpnext/docs/assets/img/schools/fees/fee-structure.png b/erpnext/docs/assets/img/education/fees/fee-structure.png similarity index 100% rename from erpnext/docs/assets/img/schools/fees/fee-structure.png rename to erpnext/docs/assets/img/education/fees/fee-structure.png diff --git a/erpnext/docs/assets/img/schools/fees/fees-section.png b/erpnext/docs/assets/img/education/fees/fees-section.png similarity index 100% rename from erpnext/docs/assets/img/schools/fees/fees-section.png rename to erpnext/docs/assets/img/education/fees/fees-section.png diff --git a/erpnext/docs/assets/img/schools/fees/fees.png b/erpnext/docs/assets/img/education/fees/fees.png similarity index 100% rename from erpnext/docs/assets/img/schools/fees/fees.png rename to erpnext/docs/assets/img/education/fees/fees.png diff --git a/erpnext/docs/assets/img/schools/home.png b/erpnext/docs/assets/img/education/home.png similarity index 100% rename from erpnext/docs/assets/img/schools/home.png rename to erpnext/docs/assets/img/education/home.png diff --git a/erpnext/docs/assets/img/schools/module.png b/erpnext/docs/assets/img/education/module.png similarity index 100% rename from erpnext/docs/assets/img/schools/module.png rename to erpnext/docs/assets/img/education/module.png diff --git a/erpnext/docs/assets/img/schools/schedule/__init__.py b/erpnext/docs/assets/img/education/schedule/__init__.py similarity index 100% rename from erpnext/docs/assets/img/schools/schedule/__init__.py rename to erpnext/docs/assets/img/education/schedule/__init__.py diff --git a/erpnext/docs/assets/img/schools/schedule/course-schedule-att-1.png b/erpnext/docs/assets/img/education/schedule/course-schedule-att-1.png similarity index 100% rename from erpnext/docs/assets/img/schools/schedule/course-schedule-att-1.png rename to erpnext/docs/assets/img/education/schedule/course-schedule-att-1.png diff --git a/erpnext/docs/assets/img/schools/schedule/course-schedule-att.png b/erpnext/docs/assets/img/education/schedule/course-schedule-att.png similarity index 100% rename from erpnext/docs/assets/img/schools/schedule/course-schedule-att.png rename to erpnext/docs/assets/img/education/schedule/course-schedule-att.png diff --git a/erpnext/docs/assets/img/schools/schedule/course-schedule.png b/erpnext/docs/assets/img/education/schedule/course-schedule.png similarity index 100% rename from erpnext/docs/assets/img/schools/schedule/course-schedule.png rename to erpnext/docs/assets/img/education/schedule/course-schedule.png diff --git a/erpnext/docs/assets/img/schools/schedule/examination.png b/erpnext/docs/assets/img/education/schedule/examination.png similarity index 100% rename from erpnext/docs/assets/img/schools/schedule/examination.png rename to erpnext/docs/assets/img/education/schedule/examination.png diff --git a/erpnext/docs/assets/img/schools/schedule/schedule-section.png b/erpnext/docs/assets/img/education/schedule/schedule-section.png similarity index 100% rename from erpnext/docs/assets/img/schools/schedule/schedule-section.png rename to erpnext/docs/assets/img/education/schedule/schedule-section.png diff --git a/erpnext/docs/assets/img/schools/schedule/scheduling-tool.png b/erpnext/docs/assets/img/education/schedule/scheduling-tool.png similarity index 100% rename from erpnext/docs/assets/img/schools/schedule/scheduling-tool.png rename to erpnext/docs/assets/img/education/schedule/scheduling-tool.png diff --git a/erpnext/docs/assets/img/schools/schedule/student-attendance.gif b/erpnext/docs/assets/img/education/schedule/student-attendance.gif similarity index 100% rename from erpnext/docs/assets/img/schools/schedule/student-attendance.gif rename to erpnext/docs/assets/img/education/schedule/student-attendance.gif diff --git a/erpnext/docs/assets/img/schools/schedule/student-attendance.png b/erpnext/docs/assets/img/education/schedule/student-attendance.png similarity index 100% rename from erpnext/docs/assets/img/schools/schedule/student-attendance.png rename to erpnext/docs/assets/img/education/schedule/student-attendance.png diff --git a/erpnext/docs/assets/img/schools/schedule/student-leave-application.gif b/erpnext/docs/assets/img/education/schedule/student-leave-application.gif similarity index 100% rename from erpnext/docs/assets/img/schools/schedule/student-leave-application.gif rename to erpnext/docs/assets/img/education/schedule/student-leave-application.gif diff --git a/erpnext/docs/assets/img/schools/setup/Course-schedule-error.png b/erpnext/docs/assets/img/education/setup/Course-schedule-error.png similarity index 100% rename from erpnext/docs/assets/img/schools/setup/Course-schedule-error.png rename to erpnext/docs/assets/img/education/setup/Course-schedule-error.png diff --git a/erpnext/docs/assets/img/schools/setup/Room-Assesment-plan.png b/erpnext/docs/assets/img/education/setup/Room-Assesment-plan.png similarity index 100% rename from erpnext/docs/assets/img/schools/setup/Room-Assesment-plan.png rename to erpnext/docs/assets/img/education/setup/Room-Assesment-plan.png diff --git a/erpnext/docs/assets/img/schools/setup/__init__.py b/erpnext/docs/assets/img/education/setup/__init__.py similarity index 100% rename from erpnext/docs/assets/img/schools/setup/__init__.py rename to erpnext/docs/assets/img/education/setup/__init__.py diff --git a/erpnext/docs/assets/img/schools/setup/academic-term.png b/erpnext/docs/assets/img/education/setup/academic-term.png similarity index 100% rename from erpnext/docs/assets/img/schools/setup/academic-term.png rename to erpnext/docs/assets/img/education/setup/academic-term.png diff --git a/erpnext/docs/assets/img/schools/setup/academic-year.png b/erpnext/docs/assets/img/education/setup/academic-year.png similarity index 100% rename from erpnext/docs/assets/img/schools/setup/academic-year.png rename to erpnext/docs/assets/img/education/setup/academic-year.png diff --git a/erpnext/docs/assets/img/schools/setup/course-fee-program.png b/erpnext/docs/assets/img/education/setup/course-fee-program.png similarity index 100% rename from erpnext/docs/assets/img/schools/setup/course-fee-program.png rename to erpnext/docs/assets/img/education/setup/course-fee-program.png diff --git a/erpnext/docs/assets/img/schools/setup/course.png b/erpnext/docs/assets/img/education/setup/course.png similarity index 100% rename from erpnext/docs/assets/img/schools/setup/course.png rename to erpnext/docs/assets/img/education/setup/course.png diff --git a/erpnext/docs/assets/img/schools/setup/instructor.png b/erpnext/docs/assets/img/education/setup/instructor.png similarity index 100% rename from erpnext/docs/assets/img/schools/setup/instructor.png rename to erpnext/docs/assets/img/education/setup/instructor.png diff --git a/erpnext/docs/assets/img/schools/setup/program.png b/erpnext/docs/assets/img/education/setup/program.png similarity index 100% rename from erpnext/docs/assets/img/schools/setup/program.png rename to erpnext/docs/assets/img/education/setup/program.png diff --git a/erpnext/docs/assets/img/schools/setup/room.png b/erpnext/docs/assets/img/education/setup/room.png similarity index 100% rename from erpnext/docs/assets/img/schools/setup/room.png rename to erpnext/docs/assets/img/education/setup/room.png diff --git a/erpnext/docs/assets/img/schools/setup/student-attendance-tool.gif b/erpnext/docs/assets/img/education/setup/student-attendance-tool.gif similarity index 100% rename from erpnext/docs/assets/img/schools/setup/student-attendance-tool.gif rename to erpnext/docs/assets/img/education/setup/student-attendance-tool.gif diff --git a/erpnext/docs/assets/img/schools/setup/student-group-instructor.png b/erpnext/docs/assets/img/education/setup/student-group-instructor.png similarity index 100% rename from erpnext/docs/assets/img/schools/setup/student-group-instructor.png rename to erpnext/docs/assets/img/education/setup/student-group-instructor.png diff --git a/erpnext/docs/assets/img/schools/student/__init__.py b/erpnext/docs/assets/img/education/student/__init__.py similarity index 100% rename from erpnext/docs/assets/img/schools/student/__init__.py rename to erpnext/docs/assets/img/education/student/__init__.py diff --git a/erpnext/docs/assets/img/schools/student/guardian.png b/erpnext/docs/assets/img/education/student/guardian.png similarity index 100% rename from erpnext/docs/assets/img/schools/student/guardian.png rename to erpnext/docs/assets/img/education/student/guardian.png diff --git a/erpnext/docs/assets/img/schools/student/schools-settings.png b/erpnext/docs/assets/img/education/student/schools-settings.png similarity index 100% rename from erpnext/docs/assets/img/schools/student/schools-settings.png rename to erpnext/docs/assets/img/education/student/schools-settings.png diff --git a/erpnext/docs/assets/img/schools/student/student group.gif b/erpnext/docs/assets/img/education/student/student group.gif similarity index 100% rename from erpnext/docs/assets/img/schools/student/student group.gif rename to erpnext/docs/assets/img/education/student/student group.gif diff --git a/erpnext/docs/assets/img/schools/student/student-admission.gif b/erpnext/docs/assets/img/education/student/student-admission.gif similarity index 100% rename from erpnext/docs/assets/img/schools/student/student-admission.gif rename to erpnext/docs/assets/img/education/student/student-admission.gif diff --git a/erpnext/docs/assets/img/schools/student/student-batch-validation.gif b/erpnext/docs/assets/img/education/student/student-batch-validation.gif similarity index 100% rename from erpnext/docs/assets/img/schools/student/student-batch-validation.gif rename to erpnext/docs/assets/img/education/student/student-batch-validation.gif diff --git a/erpnext/docs/assets/img/schools/student/student-batch.gif b/erpnext/docs/assets/img/education/student/student-batch.gif similarity index 100% rename from erpnext/docs/assets/img/schools/student/student-batch.gif rename to erpnext/docs/assets/img/education/student/student-batch.gif diff --git a/erpnext/docs/assets/img/schools/student/student-course-validation.gif b/erpnext/docs/assets/img/education/student/student-course-validation.gif similarity index 100% rename from erpnext/docs/assets/img/schools/student/student-course-validation.gif rename to erpnext/docs/assets/img/education/student/student-course-validation.gif diff --git a/erpnext/docs/assets/img/schools/student/student-group-attendance.gif b/erpnext/docs/assets/img/education/student/student-group-attendance.gif similarity index 100% rename from erpnext/docs/assets/img/schools/student/student-group-attendance.gif rename to erpnext/docs/assets/img/education/student/student-group-attendance.gif diff --git a/erpnext/docs/assets/img/schools/student/student-group-creation-tool.gif b/erpnext/docs/assets/img/education/student/student-group-creation-tool.gif similarity index 100% rename from erpnext/docs/assets/img/schools/student/student-group-creation-tool.gif rename to erpnext/docs/assets/img/education/student/student-group-creation-tool.gif diff --git a/erpnext/docs/assets/img/schools/student/student-log.png b/erpnext/docs/assets/img/education/student/student-log.png similarity index 100% rename from erpnext/docs/assets/img/schools/student/student-log.png rename to erpnext/docs/assets/img/education/student/student-log.png diff --git a/erpnext/docs/assets/img/schools/student/student.png b/erpnext/docs/assets/img/education/student/student.png similarity index 100% rename from erpnext/docs/assets/img/schools/student/student.png rename to erpnext/docs/assets/img/education/student/student.png diff --git a/erpnext/docs/user/manual/en/schools/Assessment/__init__.py b/erpnext/docs/user/manual/en/education/Assessment/__init__.py similarity index 100% rename from erpnext/docs/user/manual/en/schools/Assessment/__init__.py rename to erpnext/docs/user/manual/en/education/Assessment/__init__.py diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md similarity index 82% rename from erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria.md rename to erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md index c422578a5ea..b97cfb12596 100644 --- a/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria.md +++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md @@ -2,12 +2,12 @@ Assessment Criteria is the parameter based on which you assess the Student. -Assessment Criteria +Assessment Criteria After assessment is conducted for a Course, marks earned are entered based on the Assessment Criteria. For example, if assessment was conducted for science subject, then you can evaluate Student in Science on various criteria like Writing, Practicals, Presentation etc. Assessment Criteria is be used when scheduling Assessment Plan for Student Group and Course. -Assessment Plan Criteria +Assessment Plan Criteria {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria_group.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria_group.md similarity index 100% rename from erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria_group.md rename to erpnext/docs/user/manual/en/education/Assessment/assessment_criteria_group.md diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_group.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md similarity index 79% rename from erpnext/docs/user/manual/en/schools/Assessment/assessment_group.md rename to erpnext/docs/user/manual/en/education/Assessment/assessment_group.md index 90c7b5d3467..ed02a5366dd 100644 --- a/erpnext/docs/user/manual/en/schools/Assessment/assessment_group.md +++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md @@ -4,10 +4,10 @@ Assessment Group tree is a master where you can define the hierarchy for examina For example, if you conduct two assessment in a academic year, then setup Assessment Group as following. -Assessment Group Term +Assessment Group Term On the same lines, you can also define multiple Assessment Group bases on assessment conducted in your institute. -Assessment Group Term +Assessment Group Term {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_plan.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md similarity index 81% rename from erpnext/docs/user/manual/en/schools/Assessment/assessment_plan.md rename to erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md index 103def13241..7272279c9b5 100644 --- a/erpnext/docs/user/manual/en/schools/Assessment/assessment_plan.md +++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md @@ -10,10 +10,10 @@ To schedule an assessment/examination for a Student Group, for specific Course, 4. Examiner and Supervisor -Assessment Plan Details +Assessment Plan Details 5. Assessment Criteria is list of criteria based which each student in will be evaluated and grades will be assigned. -Assessment Plan Criteria +Assessment Plan Criteria {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_result.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_result.md similarity index 68% rename from erpnext/docs/user/manual/en/schools/Assessment/assessment_result.md rename to erpnext/docs/user/manual/en/education/Assessment/assessment_result.md index dc35ca7ee9e..ed3e5fb3344 100644 --- a/erpnext/docs/user/manual/en/schools/Assessment/assessment_result.md +++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_result.md @@ -1,7 +1,7 @@ #Assessment Result -Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool](/docs/user/manual/en/schools/assessment/assessment_result_tool.html). +Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool](/docs/user/manual/en/education/assessment/assessment_result_tool.html). -Assessment Result +Assessment Result {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_result_tool.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md similarity index 89% rename from erpnext/docs/user/manual/en/schools/Assessment/assessment_result_tool.md rename to erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md index bb2a2ba4636..88b7a7a078e 100644 --- a/erpnext/docs/user/manual/en/schools/Assessment/assessment_result_tool.md +++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md @@ -2,7 +2,7 @@ Assessment Result Tool help you entering marks earned by the Students for specific course. In this tool, based on the Assessment Plan, all the Student will be fetched into Assessment Result Tool. Also, Columns for Assessment Criteria will be where marks earned can be entered for each Student. -Assessment Result Tool +Assessment Result Tool As you go on entering marks for a Student, and switch to next student, in the backend, Student Result record will be auto-created for that Student. diff --git a/erpnext/docs/user/manual/en/schools/Assessment/grading_scale.md b/erpnext/docs/user/manual/en/education/Assessment/grading_scale.md similarity index 83% rename from erpnext/docs/user/manual/en/schools/Assessment/grading_scale.md rename to erpnext/docs/user/manual/en/education/Assessment/grading_scale.md index 45191124b89..0ad610b6331 100644 --- a/erpnext/docs/user/manual/en/schools/Assessment/grading_scale.md +++ b/erpnext/docs/user/manual/en/education/Assessment/grading_scale.md @@ -2,6 +2,6 @@ In the Grading Scale, you can define various grades and threshold for them. Based on the score earned by an Student for an Assessment, Grade will be assigned. -Grading Scale +Grading Scale {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/Assessment/index.md b/erpnext/docs/user/manual/en/education/Assessment/index.md similarity index 100% rename from erpnext/docs/user/manual/en/schools/Assessment/index.md rename to erpnext/docs/user/manual/en/education/Assessment/index.md diff --git a/erpnext/docs/user/manual/en/schools/Assessment/index.txt b/erpnext/docs/user/manual/en/education/Assessment/index.txt similarity index 100% rename from erpnext/docs/user/manual/en/schools/Assessment/index.txt rename to erpnext/docs/user/manual/en/education/Assessment/index.txt diff --git a/erpnext/docs/user/manual/en/schools/Attendance/__init__.py b/erpnext/docs/user/manual/en/education/Attendance/__init__.py similarity index 100% rename from erpnext/docs/user/manual/en/schools/Attendance/__init__.py rename to erpnext/docs/user/manual/en/education/Attendance/__init__.py diff --git a/erpnext/docs/user/manual/en/schools/Attendance/index.md b/erpnext/docs/user/manual/en/education/Attendance/index.md similarity index 100% rename from erpnext/docs/user/manual/en/schools/Attendance/index.md rename to erpnext/docs/user/manual/en/education/Attendance/index.md diff --git a/erpnext/docs/user/manual/en/schools/Attendance/index.txt b/erpnext/docs/user/manual/en/education/Attendance/index.txt similarity index 100% rename from erpnext/docs/user/manual/en/schools/Attendance/index.txt rename to erpnext/docs/user/manual/en/education/Attendance/index.txt diff --git a/erpnext/docs/user/manual/en/schools/Attendance/student-attendance-tool.md b/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md similarity index 87% rename from erpnext/docs/user/manual/en/schools/Attendance/student-attendance-tool.md rename to erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md index 5c4ce3072a3..fac9d6e69d8 100644 --- a/erpnext/docs/user/manual/en/schools/Attendance/student-attendance-tool.md +++ b/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md @@ -10,6 +10,6 @@ To mark the **Attedance* based on Student Group select the group based on Student detials will be autofetched and you can mark the attendance of the given date. -Student Attendance +Student Attendance {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/Attendance/student-attendance.md b/erpnext/docs/user/manual/en/education/Attendance/student-attendance.md similarity index 92% rename from erpnext/docs/user/manual/en/schools/Attendance/student-attendance.md rename to erpnext/docs/user/manual/en/education/Attendance/student-attendance.md index 1b917d0ae26..4be2831f309 100644 --- a/erpnext/docs/user/manual/en/schools/Attendance/student-attendance.md +++ b/erpnext/docs/user/manual/en/education/Attendance/student-attendance.md @@ -8,7 +8,7 @@ To create Attendance record : Select the **Student, Course Schedule and Student Group** for which attendance is to be marked for the given date. Set the Status to Present/Absent and save. -Student Attendance +Student Attendance **Student Attendance tool** can be used for bulk updation of the attendance based on **Batch, Course or Activity**. diff --git a/erpnext/docs/user/manual/en/schools/Attendance/student-leave-application.md b/erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md similarity index 63% rename from erpnext/docs/user/manual/en/schools/Attendance/student-leave-application.md rename to erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md index 5620bdadd73..e22c6e9d688 100644 --- a/erpnext/docs/user/manual/en/schools/Attendance/student-leave-application.md +++ b/erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md @@ -4,9 +4,9 @@ ERPNext allows you to record the leave application for a student. To create a Student Leave application record, enter the Student and the date for the leave is applied and save. -Student Attendance +Student Attendance -Incase the student is not attending the school in order to participate or represent school in any event, he/she can be mark as present from the Leave Application itself. +Incase the student is not attending the institute in order to participate or represent institute in any event, he/she can be mark as present from the Leave Application itself. Once a Leave Application is recorded for a student it will not be recorded in the absent student report as he has applied for a leave. diff --git a/erpnext/docs/user/manual/en/schools/__init__.py b/erpnext/docs/user/manual/en/education/__init__.py similarity index 100% rename from erpnext/docs/user/manual/en/schools/__init__.py rename to erpnext/docs/user/manual/en/education/__init__.py diff --git a/erpnext/docs/user/manual/en/schools/admission/__init__.py b/erpnext/docs/user/manual/en/education/admission/__init__.py similarity index 100% rename from erpnext/docs/user/manual/en/schools/admission/__init__.py rename to erpnext/docs/user/manual/en/education/admission/__init__.py diff --git a/erpnext/docs/user/manual/en/schools/admission/index.md b/erpnext/docs/user/manual/en/education/admission/index.md similarity index 100% rename from erpnext/docs/user/manual/en/schools/admission/index.md rename to erpnext/docs/user/manual/en/education/admission/index.md diff --git a/erpnext/docs/user/manual/en/schools/admission/index.txt b/erpnext/docs/user/manual/en/education/admission/index.txt similarity index 100% rename from erpnext/docs/user/manual/en/schools/admission/index.txt rename to erpnext/docs/user/manual/en/education/admission/index.txt diff --git a/erpnext/docs/user/manual/en/schools/admission/program-enrollment-tool.md b/erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md similarity index 81% rename from erpnext/docs/user/manual/en/schools/admission/program-enrollment-tool.md rename to erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md index 2a2fa1e58e7..53d9d9c84d1 100644 --- a/erpnext/docs/user/manual/en/schools/admission/program-enrollment-tool.md +++ b/erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md @@ -7,10 +7,10 @@ You can create the the Program Enrollment for : 1. **Student Applicants** >> List of Student Applicants will be fetched for the selected **Program** and **Academic year**. -Student Applicant Enrollment +Student Applicant Enrollment 2. **Program Enrollment** >> You can bulk update the **Program** for the students from one academic year to another in the same **Program** or a new **Program**. -Student Applicant Enrollment +Student Applicant Enrollment {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md b/erpnext/docs/user/manual/en/education/admission/program-enrollment.md similarity index 91% rename from erpnext/docs/user/manual/en/schools/admission/program-enrollment.md rename to erpnext/docs/user/manual/en/education/admission/program-enrollment.md index cc1308cf6c1..0bf16dfd3a0 100644 --- a/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md +++ b/erpnext/docs/user/manual/en/education/admission/program-enrollment.md @@ -4,7 +4,7 @@ Program Enrollment describes an educational model where students must complete a Once a student have applied for the **Program** and the application is approved, the program enrollment is done for that student. -Student Applicant Enrollment +Student Applicant Enrollment - A student can be enrolled in multiple Course for a program in a given academeic year. - Based on the Fee structure selected at the time of enrollment Fee detials are created of the student. diff --git a/erpnext/docs/user/manual/en/schools/admission/student-applicant.md b/erpnext/docs/user/manual/en/education/admission/student-applicant.md similarity index 86% rename from erpnext/docs/user/manual/en/schools/admission/student-applicant.md rename to erpnext/docs/user/manual/en/education/admission/student-applicant.md index 22d370939d1..121844cf9a5 100644 --- a/erpnext/docs/user/manual/en/schools/admission/student-applicant.md +++ b/erpnext/docs/user/manual/en/education/admission/student-applicant.md @@ -3,7 +3,7 @@ A Student Applicant record needs to be created when a student applies for a program at your institute. You can Approve or Reject a student applicant. By accepting a student applicant you can add them to the student master. -Student Applicant +Student Applicant ### Application Status @@ -20,11 +20,11 @@ You can Approve or Reject a student applicant. By accepting a student applicant ### Student Enrollment Once the form is submitted you can either approve or reject the application form. -Student Applicant Enrollment +Student Applicant Enrollment Once you approve a Student Applicant you can enroll them to a program. When you click the 'Enroll' buttom, -the system shall create a student against that applicant and redirect you to the [Program Enrollment form](/docs/user/manual/en/schools/student/program-enrollment.html). +the system shall create a student against that applicant and redirect you to the [Program Enrollment form](/docs/user/manual/en/education/student/program-enrollment.html). -Student Applicant Enrollment +Student Applicant Enrollment {next} diff --git a/erpnext/docs/user/manual/en/schools/admission/student_admission.md b/erpnext/docs/user/manual/en/education/admission/student_admission.md similarity index 84% rename from erpnext/docs/user/manual/en/schools/admission/student_admission.md rename to erpnext/docs/user/manual/en/education/admission/student_admission.md index 7a63fa7a75c..f2b8ef6102c 100644 --- a/erpnext/docs/user/manual/en/schools/admission/student_admission.md +++ b/erpnext/docs/user/manual/en/education/admission/student_admission.md @@ -4,10 +4,10 @@ The admission process begins with filling the admission form. The Student Admiss To create a Student Admission record go to : -**Schools** >> **Admissions** >> **Student Admission** >> +**education** >> **Admissions** >> **Student Admission** >> -Student Applicant +Student Applicant Once an admission record is created, the age eligibility criteria can be determined for the every program. Similarly, you can also determine the application fee and naming series for every student applicant. If you keep the naming series blank then the default naming series will be applied for every student applicant. diff --git a/erpnext/docs/user/manual/en/schools/fees/__init__.py b/erpnext/docs/user/manual/en/education/fees/__init__.py similarity index 100% rename from erpnext/docs/user/manual/en/schools/fees/__init__.py rename to erpnext/docs/user/manual/en/education/fees/__init__.py diff --git a/erpnext/docs/user/manual/en/schools/fees/fee-category.md b/erpnext/docs/user/manual/en/education/fees/fee-category.md similarity index 75% rename from erpnext/docs/user/manual/en/schools/fees/fee-category.md rename to erpnext/docs/user/manual/en/education/fees/fee-category.md index fbf43e6f238..8a4822f3b49 100644 --- a/erpnext/docs/user/manual/en/schools/fees/fee-category.md +++ b/erpnext/docs/user/manual/en/education/fees/fee-category.md @@ -2,6 +2,6 @@ List of all different type of fees collected. -Fees Category +Fees Category {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/fees/fee-structure.md b/erpnext/docs/user/manual/en/education/fees/fee-structure.md similarity index 78% rename from erpnext/docs/user/manual/en/schools/fees/fee-structure.md rename to erpnext/docs/user/manual/en/education/fees/fee-structure.md index a1dd9be6adc..b1cc36d878a 100644 --- a/erpnext/docs/user/manual/en/schools/fees/fee-structure.md +++ b/erpnext/docs/user/manual/en/education/fees/fee-structure.md @@ -2,6 +2,6 @@ A Fee Structure is a template that can be used while making fee records. -Fees Structure +Fees Structure {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/education/fees/fees.md b/erpnext/docs/user/manual/en/education/fees/fees.md new file mode 100644 index 00000000000..5e0c126dff2 --- /dev/null +++ b/erpnext/docs/user/manual/en/education/fees/fees.md @@ -0,0 +1,8 @@ +# Fees + +Maintain a record of fees collected from students. +The [Fee Structure](/docs/user/manual/en/education/fees/fee-structure.html) is fetched based on the selected Program and Academic Term. + +Fees + +{next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/fees/index.md b/erpnext/docs/user/manual/en/education/fees/index.md similarity index 76% rename from erpnext/docs/user/manual/en/schools/fees/index.md rename to erpnext/docs/user/manual/en/education/fees/index.md index c5be5f6810e..d0ccb948574 100644 --- a/erpnext/docs/user/manual/en/schools/fees/index.md +++ b/erpnext/docs/user/manual/en/education/fees/index.md @@ -2,7 +2,7 @@ This section contains 'Fee' related documents. -Fees Section +Fees Section ### Topics diff --git a/erpnext/docs/user/manual/en/schools/fees/index.txt b/erpnext/docs/user/manual/en/education/fees/index.txt similarity index 100% rename from erpnext/docs/user/manual/en/schools/fees/index.txt rename to erpnext/docs/user/manual/en/education/fees/index.txt diff --git a/erpnext/docs/user/manual/en/education/index.md b/erpnext/docs/user/manual/en/education/index.md new file mode 100644 index 00000000000..36c6bbd7729 --- /dev/null +++ b/erpnext/docs/user/manual/en/education/index.md @@ -0,0 +1,8 @@ +# Education + + +The Education Domain in ERPNext is designed to meet requirements of any educational Institute whether that is a school, college or any other private firm. ERPNext provides a centralized system, which can be used to maintain and update all the activities related to an Institution. It will provide a complete package for every funcationality required in any institute like Online Admission, Fees, Attendance, Examination. + +Fees Section + +{index} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/index.txt b/erpnext/docs/user/manual/en/education/index.txt similarity index 100% rename from erpnext/docs/user/manual/en/schools/index.txt rename to erpnext/docs/user/manual/en/education/index.txt diff --git a/erpnext/docs/user/manual/en/schools/schedule/__init__.py b/erpnext/docs/user/manual/en/education/schedule/__init__.py similarity index 100% rename from erpnext/docs/user/manual/en/schools/schedule/__init__.py rename to erpnext/docs/user/manual/en/education/schedule/__init__.py diff --git a/erpnext/docs/user/manual/en/schools/schedule/course-schedule.md b/erpnext/docs/user/manual/en/education/schedule/course-schedule.md similarity index 84% rename from erpnext/docs/user/manual/en/schools/schedule/course-schedule.md rename to erpnext/docs/user/manual/en/education/schedule/course-schedule.md index 9f7d9809988..f5134d59fff 100644 --- a/erpnext/docs/user/manual/en/schools/schedule/course-schedule.md +++ b/erpnext/docs/user/manual/en/education/schedule/course-schedule.md @@ -3,13 +3,13 @@ Course Schedule is the schedule of a session conducted by an Instructor for a particular Course. You can see the overall course schedule in the Calendar view. -Course Schedule +Course Schedule ### Marking Attendance You can mark attendance for a Student Group against a Course Schedule. -Course Schedule Attendance +Course Schedule Attendance - To make attendance, expand the attendance section. - Check the students who were present for that session. @@ -20,6 +20,6 @@ You can mark attendance for a Student Group against a Course Schedule. Once you have marked Attendance against a Course Schedule the Attendance section in the Course Schedule shall be hidden. A View Attendance button shall appear. Click on that button to view all attendance records created against that Course Schedule. -Course Schedule Attendance +Course Schedule Attendance {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/schedule/examination.md b/erpnext/docs/user/manual/en/education/schedule/examination.md similarity index 80% rename from erpnext/docs/user/manual/en/schools/schedule/examination.md rename to erpnext/docs/user/manual/en/education/schedule/examination.md index d167e9c56d7..d21d204189c 100644 --- a/erpnext/docs/user/manual/en/schools/schedule/examination.md +++ b/erpnext/docs/user/manual/en/education/schedule/examination.md @@ -2,7 +2,7 @@ The Examination record can be used to track the exam schedule and the results of that exam. -Examination +Examination {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/schedule/index.md b/erpnext/docs/user/manual/en/education/schedule/index.md similarity index 62% rename from erpnext/docs/user/manual/en/schools/schedule/index.md rename to erpnext/docs/user/manual/en/education/schedule/index.md index 57e578bd98a..247b0b88930 100644 --- a/erpnext/docs/user/manual/en/schools/schedule/index.md +++ b/erpnext/docs/user/manual/en/education/schedule/index.md @@ -1,6 +1,6 @@ # Schedule -Schedule Section +Schedule Section ### Topics diff --git a/erpnext/docs/user/manual/en/schools/schedule/index.txt b/erpnext/docs/user/manual/en/education/schedule/index.txt similarity index 100% rename from erpnext/docs/user/manual/en/schools/schedule/index.txt rename to erpnext/docs/user/manual/en/education/schedule/index.txt diff --git a/erpnext/docs/user/manual/en/schools/schedule/scheduling-tool.md b/erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md similarity index 96% rename from erpnext/docs/user/manual/en/schools/schedule/scheduling-tool.md rename to erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md index 9e13d6d0a6a..08a7fa9ec0c 100644 --- a/erpnext/docs/user/manual/en/schools/schedule/scheduling-tool.md +++ b/erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md @@ -2,7 +2,7 @@ This tool can be used to create 'Course Schedules'. -Scheduling Tool +Scheduling Tool ### Creating Course Schedules diff --git a/erpnext/docs/user/manual/en/schools/setup/__init__.py b/erpnext/docs/user/manual/en/education/setup/__init__.py similarity index 100% rename from erpnext/docs/user/manual/en/schools/setup/__init__.py rename to erpnext/docs/user/manual/en/education/setup/__init__.py diff --git a/erpnext/docs/user/manual/en/schools/setup/academic-term.md b/erpnext/docs/user/manual/en/education/setup/academic-term.md similarity index 92% rename from erpnext/docs/user/manual/en/schools/setup/academic-term.md rename to erpnext/docs/user/manual/en/education/setup/academic-term.md index b52bea71086..d264dca5d66 100644 --- a/erpnext/docs/user/manual/en/schools/setup/academic-term.md +++ b/erpnext/docs/user/manual/en/education/setup/academic-term.md @@ -4,7 +4,7 @@ An academic term (or simply "term") is a portion of an academic year, the time d The **Academic term** form in ERPNext enables you to create academic terms within in a year. Based on the term schedule enter the start and end date for the schedule and generate the term for a Academic year. -Academic Term +Academic Term {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/setup/academic-year.md b/erpnext/docs/user/manual/en/education/setup/academic-year.md similarity index 61% rename from erpnext/docs/user/manual/en/schools/setup/academic-year.md rename to erpnext/docs/user/manual/en/education/setup/academic-year.md index 4fc5f929a56..c9ea5211854 100644 --- a/erpnext/docs/user/manual/en/schools/setup/academic-year.md +++ b/erpnext/docs/user/manual/en/education/setup/academic-year.md @@ -1,10 +1,10 @@ # Academic Year -An academic year is a period of time which schools, colleges and universities use to measure a quantity of study. +An academic year is a period of time which education, colleges and universities use to measure a quantity of study. The **Academic year** form have the Start and End date for the Academic year. -Academic Year +Academic Year **Student group** link is given to view or add the respective groups to the Academic year. diff --git a/erpnext/docs/user/manual/en/schools/setup/course.md b/erpnext/docs/user/manual/en/education/setup/course.md similarity index 78% rename from erpnext/docs/user/manual/en/schools/setup/course.md rename to erpnext/docs/user/manual/en/education/setup/course.md index dc10ed54b17..0d6e5ac5eb7 100644 --- a/erpnext/docs/user/manual/en/schools/setup/course.md +++ b/erpnext/docs/user/manual/en/education/setup/course.md @@ -4,11 +4,11 @@ To create a **Course** enter the Course name and Code. Code for the course should be unique for every course. You can also link the department under which the course is conducted. -Course +Course Once a **Course** is created, a course schedule can defined for the same. -Course +Course The Course form is further linked to **Program, Student Group and Assessment Plan** doctypes. The links allow to view/create the related documents for a **Course**. diff --git a/erpnext/docs/user/manual/en/education/setup/index.md b/erpnext/docs/user/manual/en/education/setup/index.md new file mode 100644 index 00000000000..1062c3a4acd --- /dev/null +++ b/erpnext/docs/user/manual/en/education/setup/index.md @@ -0,0 +1,9 @@ +# Setup + +The Setup section of education module provides facility to make some basic configuration. Below are doctypes for basic configuration. + +Setup Section + +### Topics + +{index} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/setup/index.txt b/erpnext/docs/user/manual/en/education/setup/index.txt similarity index 84% rename from erpnext/docs/user/manual/en/schools/setup/index.txt rename to erpnext/docs/user/manual/en/education/setup/index.txt index 8fb9bb2def9..9f88c5de3c9 100644 --- a/erpnext/docs/user/manual/en/schools/setup/index.txt +++ b/erpnext/docs/user/manual/en/education/setup/index.txt @@ -6,4 +6,4 @@ student-category student-batch-name academic-term academic-year -school-settings \ No newline at end of file +education-settings \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/setup/instructor.md b/erpnext/docs/user/manual/en/education/setup/instructor.md similarity index 65% rename from erpnext/docs/user/manual/en/schools/setup/instructor.md rename to erpnext/docs/user/manual/en/education/setup/instructor.md index 6150f025fe7..2b53ce13fe9 100644 --- a/erpnext/docs/user/manual/en/schools/setup/instructor.md +++ b/erpnext/docs/user/manual/en/education/setup/instructor.md @@ -4,14 +4,14 @@ An instructoe is a teacher, or professor, of a specialised subject that involves You can create an Instructor and link it to the Employee master and a Departmemt. -Instructor +Instructor An **Instructor** is further linked to a **Course Schedule**, where you can define the schedule for a **Course** for a give date and **Room no**. -Instructor +Instructor It is also linked to **Student group** where an **Instructor** is assigned to the Student group. -Instructor +Instructor An **Instructor** is also linked to an **Assesment Plan** for a Student group. The Instructor can be an Examiner or the supervisor for the assesment. diff --git a/erpnext/docs/user/manual/en/schools/setup/program.md b/erpnext/docs/user/manual/en/education/setup/program.md similarity index 70% rename from erpnext/docs/user/manual/en/schools/setup/program.md rename to erpnext/docs/user/manual/en/education/setup/program.md index be10166e7be..25e390eb87b 100644 --- a/erpnext/docs/user/manual/en/schools/setup/program.md +++ b/erpnext/docs/user/manual/en/education/setup/program.md @@ -4,15 +4,15 @@ An educational program is a program written by the institutions which determines To create a Program go to : -###Schools >> Setup >> Program >> New Program +###education >> Setup >> Program >> New Program Enter a unique code for every **Program**. You can also link the **Program** to the department under which it is conducted. -Program +Program Add the relevant Course and the Fee details for a program. -Program +Program The Program Doctype is further linked to the **Student applicant**, **Program enrollment, Student group, Fee structre and Fee**. The links allow to view or create the related document for a Program. diff --git a/erpnext/docs/user/manual/en/schools/setup/room.md b/erpnext/docs/user/manual/en/education/setup/room.md similarity index 72% rename from erpnext/docs/user/manual/en/schools/setup/room.md rename to erpnext/docs/user/manual/en/education/setup/room.md index 43ddde92245..6a1f32e9ff4 100644 --- a/erpnext/docs/user/manual/en/schools/setup/room.md +++ b/erpnext/docs/user/manual/en/education/setup/room.md @@ -4,14 +4,14 @@ A classroom is a space (room or lab) where you want to schedule courses or exami The Room doctype allows you to record the room number and the seating capacity for a classroom. Once a room is created Course schedule link is provided in the Room doctype to view or add the course schedule for the classroom. -Room +Room The course schedule validate the availability of the Room number and an alert message is shown if there is an overlap for the Room number for a given time slot. -Room +Room The Room number is further linked to the Assesment plan. It validates the availability of examination room for the assessment to be held for a given date and time. -Room +Room {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/education/setup/school-settings.md b/erpnext/docs/user/manual/en/education/setup/school-settings.md new file mode 100644 index 00000000000..44f9c44ed11 --- /dev/null +++ b/erpnext/docs/user/manual/en/education/setup/school-settings.md @@ -0,0 +1,15 @@ +# Education Settings + +The Education Settings page allow you to setup basic settings like **Academic Year and Term** for the educational setup. + +Student + +The checkbox to Validate Batch for Students in Student Group enables the Student Batch validation for every Student from the Program Enrollment for the **Batch** based on **Student Group** + +Student + +You can enable the validation of Course for every Student from the enrolled Courses in Program Enrollment,for Course based Student Group by checking the settings for **Validate Enrolled Course for Students in Student Group** + +Student + +{next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/setup/student-batch-name.md b/erpnext/docs/user/manual/en/education/setup/student-batch-name.md similarity index 80% rename from erpnext/docs/user/manual/en/schools/setup/student-batch-name.md rename to erpnext/docs/user/manual/en/education/setup/student-batch-name.md index 056f9108636..3b5ad41edd5 100644 --- a/erpnext/docs/user/manual/en/schools/setup/student-batch-name.md +++ b/erpnext/docs/user/manual/en/education/setup/student-batch-name.md @@ -2,7 +2,7 @@ Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch -Student +Student You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch. diff --git a/erpnext/docs/user/manual/en/schools/setup/student-category.md b/erpnext/docs/user/manual/en/education/setup/student-category.md similarity index 78% rename from erpnext/docs/user/manual/en/schools/setup/student-category.md rename to erpnext/docs/user/manual/en/education/setup/student-category.md index 0d769279727..cb5cbeae388 100644 --- a/erpnext/docs/user/manual/en/schools/setup/student-category.md +++ b/erpnext/docs/user/manual/en/education/setup/student-category.md @@ -6,7 +6,7 @@ To create Student category go to Setup >> Student Category >> New. We can create new student category by adding a name and save it -Student +Student {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/student/__init__.py b/erpnext/docs/user/manual/en/education/student/__init__.py similarity index 100% rename from erpnext/docs/user/manual/en/schools/student/__init__.py rename to erpnext/docs/user/manual/en/education/student/__init__.py diff --git a/erpnext/docs/user/manual/en/schools/student/guardian.md b/erpnext/docs/user/manual/en/education/student/guardian.md similarity index 68% rename from erpnext/docs/user/manual/en/schools/student/guardian.md rename to erpnext/docs/user/manual/en/education/student/guardian.md index 7bbdbc22c5c..ca34e8b7657 100644 --- a/erpnext/docs/user/manual/en/schools/student/guardian.md +++ b/erpnext/docs/user/manual/en/education/student/guardian.md @@ -2,7 +2,7 @@ The Guardian doctype allows you to record the guardian details for a **Student**. -Student +Student The email id added in the **Guardian** detail can be linked to a email group for sending newsletter or announcements. diff --git a/erpnext/docs/user/manual/en/schools/student/index.md b/erpnext/docs/user/manual/en/education/student/index.md similarity index 100% rename from erpnext/docs/user/manual/en/schools/student/index.md rename to erpnext/docs/user/manual/en/education/student/index.md diff --git a/erpnext/docs/user/manual/en/schools/student/index.txt b/erpnext/docs/user/manual/en/education/student/index.txt similarity index 100% rename from erpnext/docs/user/manual/en/schools/student/index.txt rename to erpnext/docs/user/manual/en/education/student/index.txt diff --git a/erpnext/docs/user/manual/en/schools/student/student-batch.md b/erpnext/docs/user/manual/en/education/student/student-batch.md similarity index 80% rename from erpnext/docs/user/manual/en/schools/student/student-batch.md rename to erpnext/docs/user/manual/en/education/student/student-batch.md index 056f9108636..3b5ad41edd5 100644 --- a/erpnext/docs/user/manual/en/schools/student/student-batch.md +++ b/erpnext/docs/user/manual/en/education/student/student-batch.md @@ -2,7 +2,7 @@ Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch -Student +Student You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch. diff --git a/erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md b/erpnext/docs/user/manual/en/education/student/student-group-creation-tool.md similarity index 82% rename from erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md rename to erpnext/docs/user/manual/en/education/student/student-group-creation-tool.md index 1cd9b1e796f..aeedd97a2e5 100644 --- a/erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md +++ b/erpnext/docs/user/manual/en/education/student/student-group-creation-tool.md @@ -4,11 +4,11 @@ The Student group creation tool allows you to create student groups in bulk. To create Student group using this tool go to -##Schools >>Student >> Student Group creation tool +##education >>Student >> Student Group creation tool Select the **Academic Term** and the **Program** for which a student group is to be created. -Student Group Creation Tool +Student Group Creation Tool By default the student group is created based on the **Course** only. The check box for "Separate course based Group for every Batch" allows you to create batchwise Student groups for a course. diff --git a/erpnext/docs/user/manual/en/schools/student/student-group.md b/erpnext/docs/user/manual/en/education/student/student-group.md similarity index 88% rename from erpnext/docs/user/manual/en/schools/student/student-group.md rename to erpnext/docs/user/manual/en/education/student/student-group.md index cf3f82c5a2d..467fb3e84e6 100644 --- a/erpnext/docs/user/manual/en/schools/student/student-group.md +++ b/erpnext/docs/user/manual/en/education/student/student-group.md @@ -6,15 +6,15 @@ A Student Group needs to be created for every course for **Academic Term** and * To create a Student Group go to: -Schools >> Student >> New Student Group +education >> Student >> New Student Group -Student Group +Student Group To create a Student group based on **Batch**, select the **Progam** and **Batch**, where as to create a Student group based on **Course**, you will only have to select the Course Code. Creating a student group based on activity allows you to group of student for events and activities happening in the institute. Once a student group is created you can mark attendance for the group. -Student Group +Student Group You can also update the **Email Group** for the Student Group. Click on Update Email Group to add all the email ids of the gaurdians in the respective email group and **Newsletter** can be created and sent to the Email group. diff --git a/erpnext/docs/user/manual/en/schools/student/student-log.md b/erpnext/docs/user/manual/en/education/student/student-log.md similarity index 72% rename from erpnext/docs/user/manual/en/schools/student/student-log.md rename to erpnext/docs/user/manual/en/education/student/student-log.md index 160e39fcdc4..5c113e4650d 100644 --- a/erpnext/docs/user/manual/en/schools/student/student-log.md +++ b/erpnext/docs/user/manual/en/education/student/student-log.md @@ -4,6 +4,6 @@ The Student log Doctype enables you to add and edit addtional information for a You can make a note of student activities using Student log. Logs can be categorised as 'General', 'Academic', 'Medical' or 'Achievement' -Student +Student {next} diff --git a/erpnext/docs/user/manual/en/schools/student/student.md b/erpnext/docs/user/manual/en/education/student/student.md similarity index 83% rename from erpnext/docs/user/manual/en/schools/student/student.md rename to erpnext/docs/user/manual/en/education/student/student.md index 09e44714e68..fce5d7ba8a8 100644 --- a/erpnext/docs/user/manual/en/schools/student/student.md +++ b/erpnext/docs/user/manual/en/education/student/student.md @@ -3,7 +3,7 @@ A Student is a person who has enrolled at your institute and you have accepted their application. The Student doctype maintains detials like personal information, date of birth, address etc. It also records the **Guardian** and sibling details. -Student +Student The student is enrolled in a **Program** when the application is approved. Once the enrollement is done the **Student Applicant** status is update to Admitted. You can view every doctype created for a particular student. Eg : Fees, Student Group, etc diff --git a/erpnext/docs/user/manual/en/index.txt b/erpnext/docs/user/manual/en/index.txt index 712ab8eabd3..34bb24e0d6f 100644 --- a/erpnext/docs/user/manual/en/index.txt +++ b/erpnext/docs/user/manual/en/index.txt @@ -15,3 +15,4 @@ website using-erpnext regional customize-erpnext +education diff --git a/erpnext/docs/user/manual/en/schools/fees/fees.md b/erpnext/docs/user/manual/en/schools/fees/fees.md deleted file mode 100644 index f17720ce85e..00000000000 --- a/erpnext/docs/user/manual/en/schools/fees/fees.md +++ /dev/null @@ -1,8 +0,0 @@ -# Fees - -Maintain a record of fees collected from students. -The [Fee Structure](/docs/user/manual/en/schools/fees/fee-structure.html) is fetched based on the selected Program and Academic Term. - -Fees - -{next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/index.md b/erpnext/docs/user/manual/en/schools/index.md deleted file mode 100644 index d317d39bfaa..00000000000 --- a/erpnext/docs/user/manual/en/schools/index.md +++ /dev/null @@ -1,8 +0,0 @@ -# Schools - - -The School Modules in ERPNext is designed to meet requirements of Schools, Colleges & Educational Institutes. This is a centralized system, which maintains and updates all the activities related to an Institution. This will ease the process of each and every aspect of a School, be it Students, Admission, Examination and Fee. - -Fees Section - -{index} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/setup/index.md b/erpnext/docs/user/manual/en/schools/setup/index.md deleted file mode 100644 index 4e0915277b7..00000000000 --- a/erpnext/docs/user/manual/en/schools/setup/index.md +++ /dev/null @@ -1,9 +0,0 @@ -# Setup - -The Setup section of Schools module provides facility to make some basic configuration. Below are doctypes for basic configuration. - -Setup Section - -### Topics - -{index} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/setup/school-settings.md b/erpnext/docs/user/manual/en/schools/setup/school-settings.md deleted file mode 100644 index ce9e9144b7a..00000000000 --- a/erpnext/docs/user/manual/en/schools/setup/school-settings.md +++ /dev/null @@ -1,15 +0,0 @@ -#School Settings - -The Schools settings page allow you to setup basic settings like **Academic Year and Term** for the Schools setup. - -Student - -The checkbox to Validate Batch for Students in Student Group enables the Student Batch validation for every Student from the Program Enrollment for the **Batch** based on **Student Group** - -Student - -You can enable the validation of Course for every Student from the enrolled Courses in Program Enrollment,for Course based Student Group by checking the settings for **Validate Enrolled Course for Students in Student Group** - -Student - -{next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/es/schools/Assessment/__init__.py b/erpnext/docs/user/manual/es/education/Assessment/__init__.py similarity index 100% rename from erpnext/docs/user/manual/es/schools/Assessment/__init__.py rename to erpnext/docs/user/manual/es/education/Assessment/__init__.py diff --git a/erpnext/docs/user/manual/es/schools/Assessment/assessment_criteria.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_criteria.md similarity index 85% rename from erpnext/docs/user/manual/es/schools/Assessment/assessment_criteria.md rename to erpnext/docs/user/manual/es/education/Assessment/assessment_criteria.md index 92f338fd8b6..31e710a309b 100644 --- a/erpnext/docs/user/manual/es/schools/Assessment/assessment_criteria.md +++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_criteria.md @@ -2,12 +2,12 @@ Criterios de evaluación es el parámetro basado en el que se evalúa el estudiante. -Assessment Criteria +Assessment Criteria Después de la evaluación para un curso, las calificaciones obtenidas se ingresan en base a los criterios de evaluación. Por ejemplo, si la evaluación se llevó a cabo para el tema de la ciencia, entonces usted puede evaluar al estudiante en ciencia en varios criterios como la escritura, prácticas, presentación, etc Los Criterios de Evaluación se usan al programar el Plan de Evaluación para el Grupo de Estudiantes y el Curso. -Assessment Plan Criteria +Assessment Plan Criteria {next} diff --git a/erpnext/docs/user/manual/es/schools/Assessment/assessment_group.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_group.md similarity index 82% rename from erpnext/docs/user/manual/es/schools/Assessment/assessment_group.md rename to erpnext/docs/user/manual/es/education/Assessment/assessment_group.md index 7102888f289..aaabda1aaa1 100644 --- a/erpnext/docs/user/manual/es/schools/Assessment/assessment_group.md +++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_group.md @@ -4,10 +4,10 @@ La estructura del grupo de evaluación es un maestro donde se puede definir la j Por ejemplo, si realiza dos evaluaciones en un año académico, configure el Grupo de evaluación de la siguiente manera. -Assessment Group Term +Assessment Group Term En la misma línea, también puede definir varios Grupo de Evaluación basado sobre la evaluación llevada a cabo en su instituto. -Assessment Group Term +Assessment Group Term {next} diff --git a/erpnext/docs/user/manual/es/schools/Assessment/assessment_plan.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_plan.md similarity index 84% rename from erpnext/docs/user/manual/es/schools/Assessment/assessment_plan.md rename to erpnext/docs/user/manual/es/education/Assessment/assessment_plan.md index 9d66c213f80..566189241fa 100644 --- a/erpnext/docs/user/manual/es/schools/Assessment/assessment_plan.md +++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_plan.md @@ -10,10 +10,10 @@ Para programar una evaluación/examinación para un Grupo de Estudiantes, para u 4. Examinador y Supervisor -Assessment Plan Details +Assessment Plan Details 5. Los Criterios de Evaluación son la lista de criterios basados ​​en que cada estudiante en será evaluado y los grados serán asignados. -Assessment Plan Criteria +Assessment Plan Criteria {next} diff --git a/erpnext/docs/user/manual/es/schools/Assessment/assessment_result.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_result.md similarity index 75% rename from erpnext/docs/user/manual/es/schools/Assessment/assessment_result.md rename to erpnext/docs/user/manual/es/education/Assessment/assessment_result.md index 2d9409708d2..67a6f9a5096 100644 --- a/erpnext/docs/user/manual/es/schools/Assessment/assessment_result.md +++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_result.md @@ -1,7 +1,7 @@ #Resultados de Evaluación -El resultado de la evaluación es un registro de las calificaciones obtenidas por el estudiante para una evaluación específica. El resultado de la evaluación se crea en el backend en base a los puntos en [Herramienta de Resultados de Evaluación](/docs/user/manual/es/schools/assessment/assessment_result_tool.html). +El resultado de la evaluación es un registro de las calificaciones obtenidas por el estudiante para una evaluación específica. El resultado de la evaluación se crea en el backend en base a los puntos en [Herramienta de Resultados de Evaluación](/docs/user/manual/es/education/assessment/assessment_result_tool.html). -Assessment Result +Assessment Result {next} diff --git a/erpnext/docs/user/manual/es/schools/Assessment/assessment_result_tool.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_result_tool.md similarity index 92% rename from erpnext/docs/user/manual/es/schools/Assessment/assessment_result_tool.md rename to erpnext/docs/user/manual/es/education/Assessment/assessment_result_tool.md index 70e4ee3f2ff..a6a44e5bee1 100644 --- a/erpnext/docs/user/manual/es/schools/Assessment/assessment_result_tool.md +++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_result_tool.md @@ -3,7 +3,7 @@ Herramienta de resultados de evaluación le ayuda a ingresar las calificaciones obtenidas por los estudiantes para un curso específico. En esta herramienta, basada en el plan de evaluación, todos los estudiantes van a ser filtrados dentro de la herramienta de resultados de la evaluación. También, Columnas para los Criterios de Evaluación serán donde las calificaciones ganadas pueden ser ingresadas para cada Estudiante. -Assessment Result Tool +Assessment Result Tool A medida que vaya introduciendo las notas para un Estudiante y cambie al siguiente alumno, en el backend, el registro de Resultados del Estudiante se creará automáticamente para ese Estudiante. diff --git a/erpnext/docs/user/manual/es/schools/Assessment/grading_scale.md b/erpnext/docs/user/manual/es/education/Assessment/grading_scale.md similarity index 87% rename from erpnext/docs/user/manual/es/schools/Assessment/grading_scale.md rename to erpnext/docs/user/manual/es/education/Assessment/grading_scale.md index 9107f92a569..bf362b4dac8 100644 --- a/erpnext/docs/user/manual/es/schools/Assessment/grading_scale.md +++ b/erpnext/docs/user/manual/es/education/Assessment/grading_scale.md @@ -2,6 +2,6 @@ En la escala de calificación, puedes definir varios grados y límites para los estudiantes. Basado en la calificación obtenida por el estudiante en la evaluación, el grado (Grade) será asignado. -Grading Scale +Grading Scale {next} diff --git a/erpnext/docs/user/manual/es/schools/Assessment/index.md b/erpnext/docs/user/manual/es/education/Assessment/index.md similarity index 100% rename from erpnext/docs/user/manual/es/schools/Assessment/index.md rename to erpnext/docs/user/manual/es/education/Assessment/index.md diff --git a/erpnext/docs/user/manual/es/schools/Assessment/index.txt b/erpnext/docs/user/manual/es/education/Assessment/index.txt similarity index 100% rename from erpnext/docs/user/manual/es/schools/Assessment/index.txt rename to erpnext/docs/user/manual/es/education/Assessment/index.txt diff --git a/erpnext/docs/user/manual/es/schools/__init__.py b/erpnext/docs/user/manual/es/education/__init__.py similarity index 100% rename from erpnext/docs/user/manual/es/schools/__init__.py rename to erpnext/docs/user/manual/es/education/__init__.py diff --git a/erpnext/docs/user/manual/es/schools/admission/__init__.py b/erpnext/docs/user/manual/es/education/admission/__init__.py similarity index 100% rename from erpnext/docs/user/manual/es/schools/admission/__init__.py rename to erpnext/docs/user/manual/es/education/admission/__init__.py diff --git a/erpnext/docs/user/manual/es/schools/admission/index.md b/erpnext/docs/user/manual/es/education/admission/index.md similarity index 100% rename from erpnext/docs/user/manual/es/schools/admission/index.md rename to erpnext/docs/user/manual/es/education/admission/index.md diff --git a/erpnext/docs/user/manual/es/schools/admission/index.txt b/erpnext/docs/user/manual/es/education/admission/index.txt similarity index 100% rename from erpnext/docs/user/manual/es/schools/admission/index.txt rename to erpnext/docs/user/manual/es/education/admission/index.txt diff --git a/erpnext/docs/user/manual/es/schools/admission/program-enrollment.md b/erpnext/docs/user/manual/es/education/admission/program-enrollment.md similarity index 78% rename from erpnext/docs/user/manual/es/schools/admission/program-enrollment.md rename to erpnext/docs/user/manual/es/education/admission/program-enrollment.md index 34e8996a254..6a242849a83 100644 --- a/erpnext/docs/user/manual/es/schools/admission/program-enrollment.md +++ b/erpnext/docs/user/manual/es/education/admission/program-enrollment.md @@ -2,6 +2,6 @@ Este formulario te permite inscribir un estudiante a un programa. Un estudiante puede ser inscrito en multiples programas. -Student Applicant Enrollment +Student Applicant Enrollment {next} diff --git a/erpnext/docs/user/manual/es/schools/admission/student-applicant.md b/erpnext/docs/user/manual/es/education/admission/student-applicant.md similarity index 89% rename from erpnext/docs/user/manual/es/schools/admission/student-applicant.md rename to erpnext/docs/user/manual/es/education/admission/student-applicant.md index 33d8dd7b294..4d8723c20c6 100644 --- a/erpnext/docs/user/manual/es/schools/admission/student-applicant.md +++ b/erpnext/docs/user/manual/es/education/admission/student-applicant.md @@ -3,7 +3,7 @@ Un registro de Aplicación de Estudiante necesita ser creado cuando un estudiante aplica para un programa en su institución. Puedes Aprobar o Rechazar una aplicación de estudiante. Aceptando una aplicación de un estudiante puedes agregarlos al master de estudiantes. -Student Applicant +Student Applicant ### Estados de la Aplicación @@ -21,8 +21,8 @@ Puedes Aprobar o Rechazar una aplicación de estudiante. Aceptando una aplicaci Una vez aprobada una Aplicación de Estudiante, puedes inscribirlo a un programa. Cuando le das click al butón 'Inscribir', -el sistema creará un estudiante usando esa aplicación y le va a redireccionar a el [Formulario de Inscripción al Programa](/docs/user/manual/es/schools/student/program-enrollment.html). +el sistema creará un estudiante usando esa aplicación y le va a redireccionar a el [Formulario de Inscripción al Programa](/docs/user/manual/es/education/student/program-enrollment.html). -Student Applicant Enrollment +Student Applicant Enrollment {next} diff --git a/erpnext/docs/user/manual/es/schools/fees/__init__.py b/erpnext/docs/user/manual/es/education/fees/__init__.py similarity index 100% rename from erpnext/docs/user/manual/es/schools/fees/__init__.py rename to erpnext/docs/user/manual/es/education/fees/__init__.py diff --git a/erpnext/docs/user/manual/es/schools/fees/fee-category.md b/erpnext/docs/user/manual/es/education/fees/fee-category.md similarity index 80% rename from erpnext/docs/user/manual/es/schools/fees/fee-category.md rename to erpnext/docs/user/manual/es/education/fees/fee-category.md index c05b3f549f3..a38ba7e812d 100644 --- a/erpnext/docs/user/manual/es/schools/fees/fee-category.md +++ b/erpnext/docs/user/manual/es/education/fees/fee-category.md @@ -2,6 +2,6 @@ Todos los tipos diferentes de cuotas que se cobran -Fees Category +Fees Category {next} diff --git a/erpnext/docs/user/manual/es/schools/fees/fee-structure.md b/erpnext/docs/user/manual/es/education/fees/fee-structure.md similarity index 83% rename from erpnext/docs/user/manual/es/schools/fees/fee-structure.md rename to erpnext/docs/user/manual/es/education/fees/fee-structure.md index 1f621d716dc..6fe6af98c2e 100644 --- a/erpnext/docs/user/manual/es/schools/fees/fee-structure.md +++ b/erpnext/docs/user/manual/es/education/fees/fee-structure.md @@ -2,6 +2,6 @@ Una Estructura de Cuota es una plantilla que puede ser usada cuando se hacen registros de cuotas. -Fees Structure +Fees Structure {next} diff --git a/erpnext/docs/user/manual/es/education/fees/fees.md b/erpnext/docs/user/manual/es/education/fees/fees.md new file mode 100644 index 00000000000..5f6eee4bfd0 --- /dev/null +++ b/erpnext/docs/user/manual/es/education/fees/fees.md @@ -0,0 +1,8 @@ +# Cuotas + +Mantiene un registro de todas las cuotas recolectadas de los estudiantes. +La [Estructura de Cuota](/docs/user/manual/es/education/fees/fee-structure.html) es seleccionada basada en el programa seleccionada y los Términos Académicos. + +Fees + +{next} diff --git a/erpnext/docs/user/manual/es/schools/fees/index.md b/erpnext/docs/user/manual/es/education/fees/index.md similarity index 82% rename from erpnext/docs/user/manual/es/schools/fees/index.md rename to erpnext/docs/user/manual/es/education/fees/index.md index e88381378df..c1b5bb57ccf 100644 --- a/erpnext/docs/user/manual/es/schools/fees/index.md +++ b/erpnext/docs/user/manual/es/education/fees/index.md @@ -2,7 +2,7 @@ Esta sección contiene todos los documentos relacionado a las 'Cuota' -Fees Section +Fees Section ### Temas diff --git a/erpnext/docs/user/manual/es/schools/fees/index.txt b/erpnext/docs/user/manual/es/education/fees/index.txt similarity index 100% rename from erpnext/docs/user/manual/es/schools/fees/index.txt rename to erpnext/docs/user/manual/es/education/fees/index.txt diff --git a/erpnext/docs/user/manual/es/schools/index.md b/erpnext/docs/user/manual/es/education/index.md similarity index 84% rename from erpnext/docs/user/manual/es/schools/index.md rename to erpnext/docs/user/manual/es/education/index.md index a1824dc6e86..feca8303c0d 100644 --- a/erpnext/docs/user/manual/es/schools/index.md +++ b/erpnext/docs/user/manual/es/education/index.md @@ -1,8 +1,8 @@ -# Schools +# Education Los módulos de School estan diseñados para satisfacer los requerimientos de Escuelas, Colegios e Institutos Educacionales. -Fees Section +Fees Section {index} diff --git a/erpnext/docs/user/manual/es/schools/index.txt b/erpnext/docs/user/manual/es/education/index.txt similarity index 100% rename from erpnext/docs/user/manual/es/schools/index.txt rename to erpnext/docs/user/manual/es/education/index.txt diff --git a/erpnext/docs/user/manual/es/schools/schedule/__init__.py b/erpnext/docs/user/manual/es/education/schedule/__init__.py similarity index 100% rename from erpnext/docs/user/manual/es/schools/schedule/__init__.py rename to erpnext/docs/user/manual/es/education/schedule/__init__.py diff --git a/erpnext/docs/user/manual/es/schools/schedule/course-schedule.md b/erpnext/docs/user/manual/es/education/schedule/course-schedule.md similarity index 86% rename from erpnext/docs/user/manual/es/schools/schedule/course-schedule.md rename to erpnext/docs/user/manual/es/education/schedule/course-schedule.md index 629c828451d..7bf40ffacf7 100644 --- a/erpnext/docs/user/manual/es/schools/schedule/course-schedule.md +++ b/erpnext/docs/user/manual/es/education/schedule/course-schedule.md @@ -3,13 +3,13 @@ El Horario de Curso es el horario de una sesión de un profesor para un Curso en particular. Puedes ver un resumen del horario del curso en la vista de Calendario. -Course Schedule +Course Schedule ### Marcando asistencia Puedes pasar la asistencia para un grupo de estudiantes usando el Horario de Curso. -Course Schedule Attendance +Course Schedule Attendance - Para hacer la asistencia, expandir la sección de asistencia. - Selecciona los estudiantes que estaban presentes para esa sesión. @@ -20,6 +20,6 @@ Puedes pasar la asistencia para un grupo de estudiantes usando el Horario de Cur Una vez hayas marcado la asistencia usando la sección de asistencia en el Horario de un Curso, esta sección debería estar oculta. Un botón de Ver Asistencia debería aparecer. Click en el botón para ver todos los registros de asistencia creados para ese Horario de Curso. -Course Schedule Attendance +Course Schedule Attendance {next} diff --git a/erpnext/docs/user/manual/es/schools/schedule/examination.md b/erpnext/docs/user/manual/es/education/schedule/examination.md similarity index 85% rename from erpnext/docs/user/manual/es/schools/schedule/examination.md rename to erpnext/docs/user/manual/es/education/schedule/examination.md index 5f85aedd413..b8cef3e9776 100644 --- a/erpnext/docs/user/manual/es/schools/schedule/examination.md +++ b/erpnext/docs/user/manual/es/education/schedule/examination.md @@ -2,7 +2,7 @@ El registro de examinación puede ser usado para hacer el seguimiento del horario de los examenes y los resultados de los mismos. -Examination +Examination {next} diff --git a/erpnext/docs/user/manual/es/schools/schedule/index.md b/erpnext/docs/user/manual/es/education/schedule/index.md similarity index 66% rename from erpnext/docs/user/manual/es/schools/schedule/index.md rename to erpnext/docs/user/manual/es/education/schedule/index.md index f9c2c3b5d12..016aa1009a0 100644 --- a/erpnext/docs/user/manual/es/schools/schedule/index.md +++ b/erpnext/docs/user/manual/es/education/schedule/index.md @@ -1,6 +1,6 @@ # Horario -Schedule Section +Schedule Section ### Temas diff --git a/erpnext/docs/user/manual/es/schools/schedule/index.txt b/erpnext/docs/user/manual/es/education/schedule/index.txt similarity index 100% rename from erpnext/docs/user/manual/es/schools/schedule/index.txt rename to erpnext/docs/user/manual/es/education/schedule/index.txt diff --git a/erpnext/docs/user/manual/es/schools/schedule/scheduling-tool.md b/erpnext/docs/user/manual/es/education/schedule/scheduling-tool.md similarity index 96% rename from erpnext/docs/user/manual/es/schools/schedule/scheduling-tool.md rename to erpnext/docs/user/manual/es/education/schedule/scheduling-tool.md index 070a0354ec6..55ff425c7f2 100644 --- a/erpnext/docs/user/manual/es/schools/schedule/scheduling-tool.md +++ b/erpnext/docs/user/manual/es/education/schedule/scheduling-tool.md @@ -2,7 +2,7 @@ Esta herramienta puede ser usada para crear los Horarios de los Cursos. -Scheduling Tool +Scheduling Tool ### Creando Horarios de Cursos diff --git a/erpnext/docs/user/manual/es/schools/schedule/student-attendance.md b/erpnext/docs/user/manual/es/education/schedule/student-attendance.md similarity index 83% rename from erpnext/docs/user/manual/es/schools/schedule/student-attendance.md rename to erpnext/docs/user/manual/es/education/schedule/student-attendance.md index a06c4f276d9..53bd4e938c6 100644 --- a/erpnext/docs/user/manual/es/schools/schedule/student-attendance.md +++ b/erpnext/docs/user/manual/es/education/schedule/student-attendance.md @@ -2,6 +2,6 @@ Mantiene los registros de la asistencia del estudiante. Los registros de asistencia pueden ser creados sobre los horarios de los cursos (Course Schedules). -Student Attendance +Student Attendance {next} diff --git a/erpnext/docs/user/manual/es/schools/setup/__init__.py b/erpnext/docs/user/manual/es/education/setup/__init__.py similarity index 100% rename from erpnext/docs/user/manual/es/schools/setup/__init__.py rename to erpnext/docs/user/manual/es/education/setup/__init__.py diff --git a/erpnext/docs/user/manual/es/schools/setup/academic-term.md b/erpnext/docs/user/manual/es/education/setup/academic-term.md similarity index 71% rename from erpnext/docs/user/manual/es/schools/setup/academic-term.md rename to erpnext/docs/user/manual/es/education/setup/academic-term.md index 83af58ac314..7a6b4056070 100644 --- a/erpnext/docs/user/manual/es/schools/setup/academic-term.md +++ b/erpnext/docs/user/manual/es/education/setup/academic-term.md @@ -1,6 +1,6 @@ # Término Académico -Academic Term +Academic Term {next} diff --git a/erpnext/docs/user/manual/es/schools/setup/academic-year.md b/erpnext/docs/user/manual/es/education/setup/academic-year.md similarity index 70% rename from erpnext/docs/user/manual/es/schools/setup/academic-year.md rename to erpnext/docs/user/manual/es/education/setup/academic-year.md index 56a46f9c390..7fe2a8f5f20 100644 --- a/erpnext/docs/user/manual/es/schools/setup/academic-year.md +++ b/erpnext/docs/user/manual/es/education/setup/academic-year.md @@ -1,5 +1,5 @@ # Año Académico -Academic Year +Academic Year {next} diff --git a/erpnext/docs/user/manual/es/education/setup/course.md b/erpnext/docs/user/manual/es/education/setup/course.md new file mode 100644 index 00000000000..fbbce625fd6 --- /dev/null +++ b/erpnext/docs/user/manual/es/education/setup/course.md @@ -0,0 +1,5 @@ +# Curso + +Course + +{next} diff --git a/erpnext/docs/user/manual/es/schools/setup/index.md b/erpnext/docs/user/manual/es/education/setup/index.md similarity index 72% rename from erpnext/docs/user/manual/es/schools/setup/index.md rename to erpnext/docs/user/manual/es/education/setup/index.md index 070db540155..59df99502e0 100644 --- a/erpnext/docs/user/manual/es/schools/setup/index.md +++ b/erpnext/docs/user/manual/es/education/setup/index.md @@ -1,6 +1,6 @@ # Configuración -Setup Section +Setup Section ### Temas diff --git a/erpnext/docs/user/manual/es/schools/setup/index.txt b/erpnext/docs/user/manual/es/education/setup/index.txt similarity index 100% rename from erpnext/docs/user/manual/es/schools/setup/index.txt rename to erpnext/docs/user/manual/es/education/setup/index.txt diff --git a/erpnext/docs/user/manual/es/education/setup/instructor.md b/erpnext/docs/user/manual/es/education/setup/instructor.md new file mode 100644 index 00000000000..4812c15856e --- /dev/null +++ b/erpnext/docs/user/manual/es/education/setup/instructor.md @@ -0,0 +1,5 @@ +# Instructor + +Instructor + +{next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/es/education/setup/program.md b/erpnext/docs/user/manual/es/education/setup/program.md new file mode 100644 index 00000000000..123605786a1 --- /dev/null +++ b/erpnext/docs/user/manual/es/education/setup/program.md @@ -0,0 +1,5 @@ +# Programa + +Program + +{next} diff --git a/erpnext/docs/user/manual/es/education/setup/room.md b/erpnext/docs/user/manual/es/education/setup/room.md new file mode 100644 index 00000000000..7750dcfabb0 --- /dev/null +++ b/erpnext/docs/user/manual/es/education/setup/room.md @@ -0,0 +1,6 @@ +# Aula + + +Room + +{next} diff --git a/erpnext/docs/user/manual/es/schools/student/__init__.py b/erpnext/docs/user/manual/es/education/student/__init__.py similarity index 100% rename from erpnext/docs/user/manual/es/schools/student/__init__.py rename to erpnext/docs/user/manual/es/education/student/__init__.py diff --git a/erpnext/docs/user/manual/es/schools/student/index.md b/erpnext/docs/user/manual/es/education/student/index.md similarity index 100% rename from erpnext/docs/user/manual/es/schools/student/index.md rename to erpnext/docs/user/manual/es/education/student/index.md diff --git a/erpnext/docs/user/manual/es/schools/student/index.txt b/erpnext/docs/user/manual/es/education/student/index.txt similarity index 100% rename from erpnext/docs/user/manual/es/schools/student/index.txt rename to erpnext/docs/user/manual/es/education/student/index.txt diff --git a/erpnext/docs/user/manual/es/schools/student/student-batch.md b/erpnext/docs/user/manual/es/education/student/student-batch.md similarity index 55% rename from erpnext/docs/user/manual/es/schools/student/student-batch.md rename to erpnext/docs/user/manual/es/education/student/student-batch.md index 4d5a17e671c..bb7c9d56fba 100644 --- a/erpnext/docs/user/manual/es/schools/student/student-batch.md +++ b/erpnext/docs/user/manual/es/education/student/student-batch.md @@ -3,6 +3,6 @@ Un lote de estudiantes es una colección de estudiantes desde los Grupos de Estudiantes. -Student +Student {next} diff --git a/erpnext/docs/user/manual/es/schools/student/student-group-creation-tool.md b/erpnext/docs/user/manual/es/education/student/student-group-creation-tool.md similarity index 77% rename from erpnext/docs/user/manual/es/schools/student/student-group-creation-tool.md rename to erpnext/docs/user/manual/es/education/student/student-group-creation-tool.md index 2102c34de96..942fadfce78 100644 --- a/erpnext/docs/user/manual/es/schools/student/student-group-creation-tool.md +++ b/erpnext/docs/user/manual/es/education/student/student-group-creation-tool.md @@ -3,6 +3,6 @@ Esta herramienta te permite crear grupos de estudiantes. Puedes especificar multiples parámetros para crearlos. -Student Group Creation Tool +Student Group Creation Tool {next} diff --git a/erpnext/docs/user/manual/es/schools/student/student-group.md b/erpnext/docs/user/manual/es/education/student/student-group.md similarity index 90% rename from erpnext/docs/user/manual/es/schools/student/student-group.md rename to erpnext/docs/user/manual/es/education/student/student-group.md index f5841cc0608..59dfcbc2758 100644 --- a/erpnext/docs/user/manual/es/schools/student/student-group.md +++ b/erpnext/docs/user/manual/es/education/student/student-group.md @@ -3,6 +3,6 @@ Un Grupo de Estudiante es una colección de estudiantes tomando el mismo curso. Puedes crear calendarios para los cursos y examinaciones para un Grupo de Estudiante. Un Grupo de Estudiante necesita ser creado para cada curso en un año o término académico en particular. -Student Group +Student Group {next} diff --git a/erpnext/docs/user/manual/es/schools/student/student-log.md b/erpnext/docs/user/manual/es/education/student/student-log.md similarity index 71% rename from erpnext/docs/user/manual/es/schools/student/student-log.md rename to erpnext/docs/user/manual/es/education/student/student-log.md index 296b867c601..e5a5e2cb4ff 100644 --- a/erpnext/docs/user/manual/es/schools/student/student-log.md +++ b/erpnext/docs/user/manual/es/education/student/student-log.md @@ -3,6 +3,6 @@ Puedes crear una nota de una actividad de un estudiante usando la bitácora de estudiante (log) Los registros de bitágora pueden ser categorizadas como 'General', 'Academic', 'Medical' or 'Achievement' -Student +Student {next} diff --git a/erpnext/docs/user/manual/es/schools/student/student.md b/erpnext/docs/user/manual/es/education/student/student.md similarity index 78% rename from erpnext/docs/user/manual/es/schools/student/student.md rename to erpnext/docs/user/manual/es/education/student/student.md index fee84c5c4c7..21724a71b98 100644 --- a/erpnext/docs/user/manual/es/schools/student/student.md +++ b/erpnext/docs/user/manual/es/education/student/student.md @@ -5,6 +5,6 @@ El doctype de Estudiante mantiene los detalles personales de los estudiantes. Puedes ver todo lo relacionado a un estudiante en particular en esta página. Ejemplo: Pagos, Grupo de Estudiante, etc. -Student +Student {next} diff --git a/erpnext/docs/user/manual/es/index.txt b/erpnext/docs/user/manual/es/index.txt index 00cf97b420c..ad85a791d72 100644 --- a/erpnext/docs/user/manual/es/index.txt +++ b/erpnext/docs/user/manual/es/index.txt @@ -1,4 +1,4 @@ introduction accounts projects -schools +education diff --git a/erpnext/docs/user/manual/es/schools/fees/fees.md b/erpnext/docs/user/manual/es/schools/fees/fees.md deleted file mode 100644 index d6b74dc300a..00000000000 --- a/erpnext/docs/user/manual/es/schools/fees/fees.md +++ /dev/null @@ -1,8 +0,0 @@ -# Cuotas - -Mantiene un registro de todas las cuotas recolectadas de los estudiantes. -La [Estructura de Cuota](/docs/user/manual/es/schools/fees/fee-structure.html) es seleccionada basada en el programa seleccionada y los Términos Académicos. - -Fees - -{next} diff --git a/erpnext/docs/user/manual/es/schools/setup/course.md b/erpnext/docs/user/manual/es/schools/setup/course.md deleted file mode 100644 index 799f9b46e11..00000000000 --- a/erpnext/docs/user/manual/es/schools/setup/course.md +++ /dev/null @@ -1,5 +0,0 @@ -# Curso - -Course - -{next} diff --git a/erpnext/docs/user/manual/es/schools/setup/instructor.md b/erpnext/docs/user/manual/es/schools/setup/instructor.md deleted file mode 100644 index 1a4d35161c2..00000000000 --- a/erpnext/docs/user/manual/es/schools/setup/instructor.md +++ /dev/null @@ -1,5 +0,0 @@ -# Instructor - -Instructor - -{next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/es/schools/setup/program.md b/erpnext/docs/user/manual/es/schools/setup/program.md deleted file mode 100644 index 78895c58068..00000000000 --- a/erpnext/docs/user/manual/es/schools/setup/program.md +++ /dev/null @@ -1,5 +0,0 @@ -# Programa - -Program - -{next} diff --git a/erpnext/docs/user/manual/es/schools/setup/room.md b/erpnext/docs/user/manual/es/schools/setup/room.md deleted file mode 100644 index 92a4de77afe..00000000000 --- a/erpnext/docs/user/manual/es/schools/setup/room.md +++ /dev/null @@ -1,6 +0,0 @@ -# Aula - - -Room - -{next} diff --git a/erpnext/docs/user/videos/learn/education.md b/erpnext/docs/user/videos/learn/education.md new file mode 100644 index 00000000000..24b0cd03faf --- /dev/null +++ b/erpnext/docs/user/videos/learn/education.md @@ -0,0 +1,7 @@ +# ERPNext for Education + + + +**Duration: 39:21** + +This video is a recording of a webinar on how education institutes can use ERPNext Education module. It covers management of Student Applications, managing masters like Students, Programs and Courses. Also, you can manage processes like Course Scheduling, Student Assessment, Fees and Attendance. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/index.md b/erpnext/docs/user/videos/learn/index.md index dad5cc0fefb..3bdf3055f57 100644 --- a/erpnext/docs/user/videos/learn/index.md +++ b/erpnext/docs/user/videos/learn/index.md @@ -27,8 +27,8 @@ ERPNext for Retailers 39:21 -
  • - ERPNext for Schools +
  • + ERPNext for Education 39:21
    • diff --git a/erpnext/docs/user/videos/learn/schools.md b/erpnext/docs/user/videos/learn/schools.md deleted file mode 100644 index 3553a533d6f..00000000000 --- a/erpnext/docs/user/videos/learn/schools.md +++ /dev/null @@ -1,7 +0,0 @@ -# ERPNext for Schools - - - -**Duration: 39:21** - -This video is a recording of a webinar on how education institutes can use ERPNext Schools module. It covers management of Student Applications, managing masters like Students, Programs and Courses. Also, you can manage processes like Course Scheduling, Student Assessment, Fees and Attendance. \ No newline at end of file diff --git a/erpnext/domains/education.py b/erpnext/domains/education.py index 7a86c764c81..eed35459079 100644 --- a/erpnext/domains/education.py +++ b/erpnext/domains/education.py @@ -8,7 +8,9 @@ data = { 'Fees', 'Task', 'ToDo', - 'Schools' + 'Education', + 'Student Attendance Tool', + 'Student Applicant' ], 'default_portal_role': 'Student', 'restricted_roles': [ @@ -17,21 +19,8 @@ data = { 'Academics User' ], 'modules': [ - 'Schools' + 'Education' ], - 'fixtures': [ - dict(doctype='Academic Year', academic_year_name='2013-14'), - dict(doctype='Academic Year', academic_year_name='2014-15'), - dict(doctype='Academic Year', academic_year_name='2015-16'), - dict(doctype='Academic Year', academic_year_name='2016-17'), - dict(doctype='Academic Year', academic_year_name='2017-18'), - dict(doctype='Academic Year', academic_year_name='2018-19'), - dict(doctype='Academic Year', academic_year_name='2019-20'), - dict(doctype='Academic Term', academic_year='2016-17', term_name='Semester 1'), - dict(doctype='Academic Term', academic_year='2016-17', term_name='Semester 2'), - dict(doctype='Academic Term', academic_year='2016-17', term_name='Semester 3'), - dict(doctype='Academic Term', academic_year='2017-18', term_name='Semester 1'), - dict(doctype='Academic Term', academic_year='2017-18', term_name='Semester 2'), - dict(doctype='Academic Term', academic_year='2017-18', term_name='Semester 3') - ] + 'on_setup': 'erpnext.education.setup.setup_education' + } \ No newline at end of file diff --git a/erpnext/schools/__init__.py b/erpnext/education/__init__.py similarity index 100% rename from erpnext/schools/__init__.py rename to erpnext/education/__init__.py diff --git a/erpnext/schools/api.py b/erpnext/education/api.py similarity index 100% rename from erpnext/schools/api.py rename to erpnext/education/api.py diff --git a/erpnext/schools/doctype/__init__.py b/erpnext/education/doctype/__init__.py similarity index 100% rename from erpnext/schools/doctype/__init__.py rename to erpnext/education/doctype/__init__.py diff --git a/erpnext/schools/doctype/academic_term/__init__.py b/erpnext/education/doctype/academic_term/__init__.py similarity index 100% rename from erpnext/schools/doctype/academic_term/__init__.py rename to erpnext/education/doctype/academic_term/__init__.py diff --git a/erpnext/schools/doctype/academic_term/academic_term.js b/erpnext/education/doctype/academic_term/academic_term.js similarity index 100% rename from erpnext/schools/doctype/academic_term/academic_term.js rename to erpnext/education/doctype/academic_term/academic_term.js diff --git a/erpnext/schools/doctype/academic_term/academic_term.json b/erpnext/education/doctype/academic_term/academic_term.json similarity index 98% rename from erpnext/schools/doctype/academic_term/academic_term.json rename to erpnext/education/doctype/academic_term/academic_term.json index b4eb83da486..06c5b1acfc2 100644 --- a/erpnext/schools/doctype/academic_term/academic_term.json +++ b/erpnext/education/doctype/academic_term/academic_term.json @@ -175,9 +175,9 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-06-30 08:21:45.897056", + "modified": "2017-11-10 19:05:58.567627", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Academic Term", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/academic_term/academic_term.py b/erpnext/education/doctype/academic_term/academic_term.py similarity index 100% rename from erpnext/schools/doctype/academic_term/academic_term.py rename to erpnext/education/doctype/academic_term/academic_term.py diff --git a/erpnext/schools/doctype/academic_term/test_academic_term.js b/erpnext/education/doctype/academic_term/test_academic_term.js similarity index 89% rename from erpnext/schools/doctype/academic_term/test_academic_term.js rename to erpnext/education/doctype/academic_term/test_academic_term.js index 688ad549057..6d91e977c63 100644 --- a/erpnext/schools/doctype/academic_term/test_academic_term.js +++ b/erpnext/education/doctype/academic_term/test_academic_term.js @@ -1,5 +1,5 @@ -// Testing Setup Module in Schools -QUnit.module('schools'); +// Testing Setup Module in Education +QUnit.module('education'); QUnit.test('Test: Academic Term', function(assert){ assert.expect(4); diff --git a/erpnext/schools/doctype/academic_term/test_academic_term.py b/erpnext/education/doctype/academic_term/test_academic_term.py similarity index 100% rename from erpnext/schools/doctype/academic_term/test_academic_term.py rename to erpnext/education/doctype/academic_term/test_academic_term.py diff --git a/erpnext/schools/doctype/academic_term/test_records.json b/erpnext/education/doctype/academic_term/test_records.json similarity index 100% rename from erpnext/schools/doctype/academic_term/test_records.json rename to erpnext/education/doctype/academic_term/test_records.json diff --git a/erpnext/schools/doctype/academic_year/__init__.py b/erpnext/education/doctype/academic_year/__init__.py similarity index 100% rename from erpnext/schools/doctype/academic_year/__init__.py rename to erpnext/education/doctype/academic_year/__init__.py diff --git a/erpnext/schools/doctype/academic_year/academic_year.js b/erpnext/education/doctype/academic_year/academic_year.js similarity index 100% rename from erpnext/schools/doctype/academic_year/academic_year.js rename to erpnext/education/doctype/academic_year/academic_year.js diff --git a/erpnext/schools/doctype/academic_year/academic_year.json b/erpnext/education/doctype/academic_year/academic_year.json similarity index 97% rename from erpnext/schools/doctype/academic_year/academic_year.json rename to erpnext/education/doctype/academic_year/academic_year.json index 3d8c4f849a2..5df89a7682d 100644 --- a/erpnext/schools/doctype/academic_year/academic_year.json +++ b/erpnext/education/doctype/academic_year/academic_year.json @@ -113,9 +113,9 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-06-30 08:21:46.121105", + "modified": "2017-11-10 19:06:08.123090", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Academic Year", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/academic_year/academic_year.py b/erpnext/education/doctype/academic_year/academic_year.py similarity index 100% rename from erpnext/schools/doctype/academic_year/academic_year.py rename to erpnext/education/doctype/academic_year/academic_year.py diff --git a/erpnext/schools/doctype/academic_year/test_academic_year.js b/erpnext/education/doctype/academic_year/test_academic_year.js similarity index 88% rename from erpnext/schools/doctype/academic_year/test_academic_year.js rename to erpnext/education/doctype/academic_year/test_academic_year.js index 7bf17729710..ec2f49c5a1b 100644 --- a/erpnext/schools/doctype/academic_year/test_academic_year.js +++ b/erpnext/education/doctype/academic_year/test_academic_year.js @@ -1,5 +1,5 @@ -// Testing Setup Module in Schools -QUnit.module('schools'); +// Testing Setup Module in Education +QUnit.module('education'); QUnit.test('Test: Academic Year', function(assert){ assert.expect(3); diff --git a/erpnext/schools/doctype/academic_year/test_academic_year.py b/erpnext/education/doctype/academic_year/test_academic_year.py similarity index 100% rename from erpnext/schools/doctype/academic_year/test_academic_year.py rename to erpnext/education/doctype/academic_year/test_academic_year.py diff --git a/erpnext/schools/doctype/academic_year/test_records.json b/erpnext/education/doctype/academic_year/test_records.json similarity index 100% rename from erpnext/schools/doctype/academic_year/test_records.json rename to erpnext/education/doctype/academic_year/test_records.json diff --git a/erpnext/schools/doctype/assessment_criteria/__init__.py b/erpnext/education/doctype/assessment_criteria/__init__.py similarity index 100% rename from erpnext/schools/doctype/assessment_criteria/__init__.py rename to erpnext/education/doctype/assessment_criteria/__init__.py diff --git a/erpnext/schools/doctype/assessment_criteria/assessment_criteria.js b/erpnext/education/doctype/assessment_criteria/assessment_criteria.js similarity index 100% rename from erpnext/schools/doctype/assessment_criteria/assessment_criteria.js rename to erpnext/education/doctype/assessment_criteria/assessment_criteria.js diff --git a/erpnext/schools/doctype/assessment_criteria/assessment_criteria.json b/erpnext/education/doctype/assessment_criteria/assessment_criteria.json similarity index 97% rename from erpnext/schools/doctype/assessment_criteria/assessment_criteria.json rename to erpnext/education/doctype/assessment_criteria/assessment_criteria.json index 2bbd2ef7cb1..9e228fd3682 100644 --- a/erpnext/schools/doctype/assessment_criteria/assessment_criteria.json +++ b/erpnext/education/doctype/assessment_criteria/assessment_criteria.json @@ -85,9 +85,9 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-06-30 08:21:46.211641", + "modified": "2017-11-10 19:08:11.311304", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Assessment Criteria", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/assessment_criteria/assessment_criteria.py b/erpnext/education/doctype/assessment_criteria/assessment_criteria.py similarity index 100% rename from erpnext/schools/doctype/assessment_criteria/assessment_criteria.py rename to erpnext/education/doctype/assessment_criteria/assessment_criteria.py diff --git a/erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.js b/erpnext/education/doctype/assessment_criteria/test_assessment_criteria.js similarity index 83% rename from erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.js rename to erpnext/education/doctype/assessment_criteria/test_assessment_criteria.js index 6c0540eebb7..db4a4cf5a8d 100644 --- a/erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.js +++ b/erpnext/education/doctype/assessment_criteria/test_assessment_criteria.js @@ -1,5 +1,5 @@ -// School Assessment module -QUnit.module('schools'); +// Education Assessment module +QUnit.module('education'); QUnit.test('Test: Assessment Criteria', function(assert){ assert.expect(0); diff --git a/erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.py b/erpnext/education/doctype/assessment_criteria/test_assessment_criteria.py similarity index 100% rename from erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.py rename to erpnext/education/doctype/assessment_criteria/test_assessment_criteria.py diff --git a/erpnext/schools/doctype/assessment_criteria/test_records.json b/erpnext/education/doctype/assessment_criteria/test_records.json similarity index 100% rename from erpnext/schools/doctype/assessment_criteria/test_records.json rename to erpnext/education/doctype/assessment_criteria/test_records.json diff --git a/erpnext/schools/doctype/assessment_criteria_group/__init__.py b/erpnext/education/doctype/assessment_criteria_group/__init__.py similarity index 100% rename from erpnext/schools/doctype/assessment_criteria_group/__init__.py rename to erpnext/education/doctype/assessment_criteria_group/__init__.py diff --git a/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.js b/erpnext/education/doctype/assessment_criteria_group/assessment_criteria_group.js similarity index 100% rename from erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.js rename to erpnext/education/doctype/assessment_criteria_group/assessment_criteria_group.js diff --git a/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.json b/erpnext/education/doctype/assessment_criteria_group/assessment_criteria_group.json similarity index 96% rename from erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.json rename to erpnext/education/doctype/assessment_criteria_group/assessment_criteria_group.json index 7aa417f6cdc..5765b4b3f7f 100644 --- a/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.json +++ b/erpnext/education/doctype/assessment_criteria_group/assessment_criteria_group.json @@ -54,9 +54,9 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-06-30 08:21:46.323964", + "modified": "2017-11-10 19:11:45.334917", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Assessment Criteria Group", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.py b/erpnext/education/doctype/assessment_criteria_group/assessment_criteria_group.py similarity index 100% rename from erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.py rename to erpnext/education/doctype/assessment_criteria_group/assessment_criteria_group.py diff --git a/erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.js b/erpnext/education/doctype/assessment_criteria_group/test_assessment_criteria_group.js similarity index 82% rename from erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.js rename to erpnext/education/doctype/assessment_criteria_group/test_assessment_criteria_group.js index 92dba1dfd86..bcfcaf82e63 100644 --- a/erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.js +++ b/erpnext/education/doctype/assessment_criteria_group/test_assessment_criteria_group.js @@ -1,5 +1,5 @@ -// School Assessment module -QUnit.module('schools'); +// Education Assessment module +QUnit.module('education'); QUnit.test('Test: Assessment Criteria Group', function(assert){ assert.expect(0); diff --git a/erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.py b/erpnext/education/doctype/assessment_criteria_group/test_assessment_criteria_group.py similarity index 100% rename from erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.py rename to erpnext/education/doctype/assessment_criteria_group/test_assessment_criteria_group.py diff --git a/erpnext/schools/doctype/assessment_group/__init__.py b/erpnext/education/doctype/assessment_group/__init__.py similarity index 100% rename from erpnext/schools/doctype/assessment_group/__init__.py rename to erpnext/education/doctype/assessment_group/__init__.py diff --git a/erpnext/schools/doctype/assessment_group/assessment_group.js b/erpnext/education/doctype/assessment_group/assessment_group.js similarity index 100% rename from erpnext/schools/doctype/assessment_group/assessment_group.js rename to erpnext/education/doctype/assessment_group/assessment_group.js diff --git a/erpnext/schools/doctype/assessment_group/assessment_group.json b/erpnext/education/doctype/assessment_group/assessment_group.json similarity index 98% rename from erpnext/schools/doctype/assessment_group/assessment_group.json rename to erpnext/education/doctype/assessment_group/assessment_group.json index 8c93bb2ec50..56917d20526 100644 --- a/erpnext/schools/doctype/assessment_group/assessment_group.json +++ b/erpnext/education/doctype/assessment_group/assessment_group.json @@ -234,9 +234,9 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-08-21 02:12:33.177318", + "modified": "2017-11-10 19:09:25.366400", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Assessment Group", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/assessment_group/assessment_group.py b/erpnext/education/doctype/assessment_group/assessment_group.py similarity index 100% rename from erpnext/schools/doctype/assessment_group/assessment_group.py rename to erpnext/education/doctype/assessment_group/assessment_group.py diff --git a/erpnext/schools/doctype/assessment_group/assessment_group_tree.js b/erpnext/education/doctype/assessment_group/assessment_group_tree.js similarity index 100% rename from erpnext/schools/doctype/assessment_group/assessment_group_tree.js rename to erpnext/education/doctype/assessment_group/assessment_group_tree.js diff --git a/erpnext/schools/doctype/assessment_group/test_assessment_group.js b/erpnext/education/doctype/assessment_group/test_assessment_group.js similarity index 98% rename from erpnext/schools/doctype/assessment_group/test_assessment_group.js rename to erpnext/education/doctype/assessment_group/test_assessment_group.js index aa6da47d221..93026d2ea54 100644 --- a/erpnext/schools/doctype/assessment_group/test_assessment_group.js +++ b/erpnext/education/doctype/assessment_group/test_assessment_group.js @@ -1,5 +1,5 @@ -// School Assessment module -QUnit.module('schools'); +// Education Assessment module +QUnit.module('education'); QUnit.test('Test: Assessment Group', function(assert){ assert.expect(4); diff --git a/erpnext/schools/doctype/assessment_group/test_assessment_group.py b/erpnext/education/doctype/assessment_group/test_assessment_group.py similarity index 100% rename from erpnext/schools/doctype/assessment_group/test_assessment_group.py rename to erpnext/education/doctype/assessment_group/test_assessment_group.py diff --git a/erpnext/schools/doctype/assessment_plan/__init__.py b/erpnext/education/doctype/assessment_plan/__init__.py similarity index 100% rename from erpnext/schools/doctype/assessment_plan/__init__.py rename to erpnext/education/doctype/assessment_plan/__init__.py diff --git a/erpnext/schools/doctype/assessment_plan/assessment_plan.js b/erpnext/education/doctype/assessment_plan/assessment_plan.js similarity index 96% rename from erpnext/schools/doctype/assessment_plan/assessment_plan.js rename to erpnext/education/doctype/assessment_plan/assessment_plan.js index e83c4d3c70e..f6fceb15636 100644 --- a/erpnext/schools/doctype/assessment_plan/assessment_plan.js +++ b/erpnext/education/doctype/assessment_plan/assessment_plan.js @@ -40,7 +40,7 @@ frappe.ui.form.on("Assessment Plan", { course: function(frm) { if (frm.doc.course && frm.doc.maximum_assessment_score) { frappe.call({ - method: "erpnext.schools.api.get_assessment_criteria", + method: "erpnext.education.api.get_assessment_criteria", args: { course: frm.doc.course }, diff --git a/erpnext/schools/doctype/assessment_plan/assessment_plan.json b/erpnext/education/doctype/assessment_plan/assessment_plan.json similarity index 99% rename from erpnext/schools/doctype/assessment_plan/assessment_plan.json rename to erpnext/education/doctype/assessment_plan/assessment_plan.json index 265612be8bf..9dbba4f99f0 100644 --- a/erpnext/schools/doctype/assessment_plan/assessment_plan.json +++ b/erpnext/education/doctype/assessment_plan/assessment_plan.json @@ -633,9 +633,9 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-06-30 08:21:46.535547", + "modified": "2017-11-10 19:12:10.383524", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Assessment Plan", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/assessment_plan/assessment_plan.py b/erpnext/education/doctype/assessment_plan/assessment_plan.py similarity index 97% rename from erpnext/schools/doctype/assessment_plan/assessment_plan.py rename to erpnext/education/doctype/assessment_plan/assessment_plan.py index 55c41485f04..7ad76b8731f 100644 --- a/erpnext/schools/doctype/assessment_plan/assessment_plan.py +++ b/erpnext/education/doctype/assessment_plan/assessment_plan.py @@ -16,7 +16,7 @@ class AssessmentPlan(Document): def validate_overlap(self): """Validates overlap for Student Group, Instructor, Room""" - from erpnext.schools.utils import validate_overlap_for + from erpnext.education.utils import validate_overlap_for #Validate overlapping course schedules. if self.student_group: diff --git a/erpnext/schools/doctype/assessment_plan/test_assessment_plan.js b/erpnext/education/doctype/assessment_plan/test_assessment_plan.js similarity index 96% rename from erpnext/schools/doctype/assessment_plan/test_assessment_plan.js rename to erpnext/education/doctype/assessment_plan/test_assessment_plan.js index faa39bf4e68..b0bff264e85 100644 --- a/erpnext/schools/doctype/assessment_plan/test_assessment_plan.js +++ b/erpnext/education/doctype/assessment_plan/test_assessment_plan.js @@ -1,5 +1,5 @@ -// Testing Assessment Module in Schools -QUnit.module('schools'); +// Testing Assessment Module in education +QUnit.module('education'); QUnit.test('Test: Assessment Plan', function(assert){ assert.expect(6); diff --git a/erpnext/schools/doctype/assessment_plan/test_assessment_plan.py b/erpnext/education/doctype/assessment_plan/test_assessment_plan.py similarity index 100% rename from erpnext/schools/doctype/assessment_plan/test_assessment_plan.py rename to erpnext/education/doctype/assessment_plan/test_assessment_plan.py diff --git a/erpnext/schools/doctype/assessment_plan_criteria/__init__.py b/erpnext/education/doctype/assessment_plan_criteria/__init__.py similarity index 100% rename from erpnext/schools/doctype/assessment_plan_criteria/__init__.py rename to erpnext/education/doctype/assessment_plan_criteria/__init__.py diff --git a/erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.json b/erpnext/education/doctype/assessment_plan_criteria/assessment_plan_criteria.json similarity index 97% rename from erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.json rename to erpnext/education/doctype/assessment_plan_criteria/assessment_plan_criteria.json index cf985f6a8c1..d9ad0cb952f 100644 --- a/erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.json +++ b/erpnext/education/doctype/assessment_plan_criteria/assessment_plan_criteria.json @@ -115,9 +115,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-06-30 08:21:46.732666", + "modified": "2017-11-10 19:10:50.560006", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Assessment Plan Criteria", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.py b/erpnext/education/doctype/assessment_plan_criteria/assessment_plan_criteria.py similarity index 100% rename from erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.py rename to erpnext/education/doctype/assessment_plan_criteria/assessment_plan_criteria.py diff --git a/erpnext/schools/doctype/assessment_result/__init__.py b/erpnext/education/doctype/assessment_result/__init__.py similarity index 100% rename from erpnext/schools/doctype/assessment_result/__init__.py rename to erpnext/education/doctype/assessment_result/__init__.py diff --git a/erpnext/schools/doctype/assessment_result/assessment_result.js b/erpnext/education/doctype/assessment_result/assessment_result.js similarity index 92% rename from erpnext/schools/doctype/assessment_result/assessment_result.js rename to erpnext/education/doctype/assessment_result/assessment_result.js index 6d2089681f4..d1115a7da67 100644 --- a/erpnext/schools/doctype/assessment_result/assessment_result.js +++ b/erpnext/education/doctype/assessment_result/assessment_result.js @@ -9,7 +9,7 @@ frappe.ui.form.on("Assessment Result", { assessment_plan: function(frm) { if (frm.doc.assessment_plan) { frappe.call({ - method: "erpnext.schools.api.get_assessment_details", + method: "erpnext.education.api.get_assessment_details", args: { assessment_plan: frm.doc.assessment_plan }, @@ -37,7 +37,7 @@ frappe.ui.form.on("Assessment Result Detail", { } else { frappe.call({ - method: "erpnext.schools.api.get_grade", + method: "erpnext.education.api.get_grade", args: { grading_scale: frm.doc.grading_scale, percentage: ((d.score/d.maximum_score) * 100) diff --git a/erpnext/schools/doctype/assessment_result/assessment_result.json b/erpnext/education/doctype/assessment_result/assessment_result.json similarity index 99% rename from erpnext/schools/doctype/assessment_result/assessment_result.json rename to erpnext/education/doctype/assessment_result/assessment_result.json index 13b927c367b..3912587f996 100644 --- a/erpnext/schools/doctype/assessment_result/assessment_result.json +++ b/erpnext/education/doctype/assessment_result/assessment_result.json @@ -474,9 +474,9 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-08-31 15:39:24.813328", + "modified": "2017-11-10 18:58:32.114529", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Assessment Result", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/assessment_result/assessment_result.py b/erpnext/education/doctype/assessment_result/assessment_result.py similarity index 94% rename from erpnext/schools/doctype/assessment_result/assessment_result.py rename to erpnext/education/doctype/assessment_result/assessment_result.py index 3c036dd56ff..7459d5afe7d 100644 --- a/erpnext/schools/doctype/assessment_result/assessment_result.py +++ b/erpnext/education/doctype/assessment_result/assessment_result.py @@ -7,8 +7,8 @@ import frappe from frappe import _ from frappe.utils import flt from frappe.model.document import Document -from erpnext.schools.api import get_grade -from erpnext.schools.api import get_assessment_details +from erpnext.education.api import get_grade +from erpnext.education.api import get_assessment_details from frappe.utils.csvutils import getlink diff --git a/erpnext/schools/doctype/assessment_result/test_assessment_result.js b/erpnext/education/doctype/assessment_result/test_assessment_result.js similarity index 95% rename from erpnext/schools/doctype/assessment_result/test_assessment_result.js rename to erpnext/education/doctype/assessment_result/test_assessment_result.js index 1ed249a75ba..b7adfacb1a2 100644 --- a/erpnext/schools/doctype/assessment_result/test_assessment_result.js +++ b/erpnext/education/doctype/assessment_result/test_assessment_result.js @@ -1,5 +1,5 @@ -// School Assessment module -QUnit.module('schools'); +// Education Assessment module +QUnit.module('education'); QUnit.test('Test: Assessment Result', function(assert){ assert.expect(25); @@ -46,7 +46,7 @@ QUnit.test('Test: Assessment Result', function(assert){ assert.equal(cur_frm.doc.maximum_score, assessment_plan.message.maximum_assessment_score, 'Maximum score correctly fetched'); frappe.call({ - method: "erpnext.schools.api.get_grade", + method: "erpnext.education.api.get_grade", args: { "grading_scale": assessment_plan.message.grading_scale, "percentage": cur_frm.doc.total_score diff --git a/erpnext/schools/doctype/assessment_result/test_assessment_result.py b/erpnext/education/doctype/assessment_result/test_assessment_result.py similarity index 91% rename from erpnext/schools/doctype/assessment_result/test_assessment_result.py rename to erpnext/education/doctype/assessment_result/test_assessment_result.py index 66e611c866f..bf12b3223be 100644 --- a/erpnext/schools/doctype/assessment_result/test_assessment_result.py +++ b/erpnext/education/doctype/assessment_result/test_assessment_result.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import frappe import unittest -from erpnext.schools.api import get_grade +from erpnext.education.api import get_grade # test_records = frappe.get_test_records('Assessment Result') diff --git a/erpnext/schools/doctype/assessment_result_detail/__init__.py b/erpnext/education/doctype/assessment_result_detail/__init__.py similarity index 100% rename from erpnext/schools/doctype/assessment_result_detail/__init__.py rename to erpnext/education/doctype/assessment_result_detail/__init__.py diff --git a/erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.json b/erpnext/education/doctype/assessment_result_detail/assessment_result_detail.json similarity index 98% rename from erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.json rename to erpnext/education/doctype/assessment_result_detail/assessment_result_detail.json index e7076bcfd64..85d943beaa5 100644 --- a/erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.json +++ b/erpnext/education/doctype/assessment_result_detail/assessment_result_detail.json @@ -175,9 +175,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-06-30 08:21:47.068704", + "modified": "2017-11-10 19:11:14.362410", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Assessment Result Detail", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.py b/erpnext/education/doctype/assessment_result_detail/assessment_result_detail.py similarity index 100% rename from erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.py rename to erpnext/education/doctype/assessment_result_detail/assessment_result_detail.py diff --git a/erpnext/schools/doctype/assessment_result_tool/__init__.py b/erpnext/education/doctype/assessment_result_tool/__init__.py similarity index 100% rename from erpnext/schools/doctype/assessment_result_tool/__init__.py rename to erpnext/education/doctype/assessment_result_tool/__init__.py diff --git a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js b/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js similarity index 94% rename from erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js rename to erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js index 142bbf4756e..48237917d3f 100644 --- a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +++ b/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js @@ -25,7 +25,7 @@ frappe.ui.form.on('Assessment Result Tool', { if (!frm.doc.student_group) return frappe.call({ - method: "erpnext.schools.api.get_assessment_students", + method: "erpnext.education.api.get_assessment_students", args: { "assessment_plan": frm.doc.assessment_plan, "student_group": frm.doc.student_group @@ -49,7 +49,7 @@ frappe.ui.form.on('Assessment Result Tool', { $(frm.fields_dict.result_html.wrapper).empty(); let assessment_plan = frm.doc.assessment_plan; frappe.call({ - method: "erpnext.schools.api.get_assessment_details", + method: "erpnext.education.api.get_assessment_details", args: { assessment_plan: assessment_plan }, @@ -106,7 +106,7 @@ frappe.ui.form.on('Assessment Result Tool', { student_scores["comment"] = $(input).val(); }); frappe.call({ - method: "erpnext.schools.api.mark_assessment_result", + method: "erpnext.education.api.mark_assessment_result", args: { "assessment_plan": frm.doc.assessment_plan, "scores": student_scores @@ -137,7 +137,7 @@ frappe.ui.form.on('Assessment Result Tool', { if (frm.doc.show_submit) { frm.page.set_primary_action(__("Submit"), function() { frappe.call({ - method: "erpnext.schools.api.submit_assessment_results", + method: "erpnext.education.api.submit_assessment_results", args: { "assessment_plan": frm.doc.assessment_plan, "student_group": frm.doc.student_group diff --git a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.json b/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.json similarity index 98% rename from erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.json rename to erpnext/education/doctype/assessment_result_tool/assessment_result_tool.json index 116fbad81ef..1ea50626399 100644 --- a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.json +++ b/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.json @@ -175,9 +175,9 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2017-11-08 11:51:43.247815", + "modified": "2017-11-10 18:55:54.438981", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Assessment Result Tool", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.py b/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.py similarity index 100% rename from erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.py rename to erpnext/education/doctype/assessment_result_tool/assessment_result_tool.py diff --git a/erpnext/schools/doctype/assessment_result_tool/test_assessment_result_tool.js b/erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.js similarity index 93% rename from erpnext/schools/doctype/assessment_result_tool/test_assessment_result_tool.js rename to erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.js index 7d9c7d31e0e..0bbe33194a3 100644 --- a/erpnext/schools/doctype/assessment_result_tool/test_assessment_result_tool.js +++ b/erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.js @@ -1,5 +1,5 @@ -// School Assessment module -QUnit.module('schools'); +// Education Assessment module +QUnit.module('education'); QUnit.test('Test: Assessment Result Tool', function(assert){ assert.expect(1); diff --git a/erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.py b/erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.py new file mode 100644 index 00000000000..f784ccb256b --- /dev/null +++ b/erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestAssessmentResultTool(unittest.TestCase): + pass diff --git a/erpnext/schools/doctype/course/__init__.py b/erpnext/education/doctype/course/__init__.py similarity index 100% rename from erpnext/schools/doctype/course/__init__.py rename to erpnext/education/doctype/course/__init__.py diff --git a/erpnext/schools/doctype/course/course.js b/erpnext/education/doctype/course/course.js similarity index 100% rename from erpnext/schools/doctype/course/course.js rename to erpnext/education/doctype/course/course.js diff --git a/erpnext/schools/doctype/course/course.json b/erpnext/education/doctype/course/course.json similarity index 99% rename from erpnext/schools/doctype/course/course.json rename to erpnext/education/doctype/course/course.json index d2f17224ea8..15360f8d582 100644 --- a/erpnext/schools/doctype/course/course.json +++ b/erpnext/education/doctype/course/course.json @@ -356,9 +356,9 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-06-30 08:21:47.260549", + "modified": "2017-11-10 19:06:28.909585", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Course", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/course/course.py b/erpnext/education/doctype/course/course.py similarity index 100% rename from erpnext/schools/doctype/course/course.py rename to erpnext/education/doctype/course/course.py diff --git a/erpnext/schools/doctype/course/test_course.js b/erpnext/education/doctype/course/test_course.js similarity index 94% rename from erpnext/schools/doctype/course/test_course.js rename to erpnext/education/doctype/course/test_course.js index 48667309cea..88fddc2bb6d 100644 --- a/erpnext/schools/doctype/course/test_course.js +++ b/erpnext/education/doctype/course/test_course.js @@ -1,5 +1,5 @@ -// Testing Setup Module in Schools -QUnit.module('schools'); +// Testing Setup Module in education +QUnit.module('education'); QUnit.test('test course', function(assert) { assert.expect(8); diff --git a/erpnext/schools/doctype/course/test_course.py b/erpnext/education/doctype/course/test_course.py similarity index 100% rename from erpnext/schools/doctype/course/test_course.py rename to erpnext/education/doctype/course/test_course.py diff --git a/erpnext/schools/doctype/course/test_records.json b/erpnext/education/doctype/course/test_records.json similarity index 100% rename from erpnext/schools/doctype/course/test_records.json rename to erpnext/education/doctype/course/test_records.json diff --git a/erpnext/schools/doctype/course_assessment_criteria/__init__.py b/erpnext/education/doctype/course_assessment_criteria/__init__.py similarity index 100% rename from erpnext/schools/doctype/course_assessment_criteria/__init__.py rename to erpnext/education/doctype/course_assessment_criteria/__init__.py diff --git a/erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.json b/erpnext/education/doctype/course_assessment_criteria/course_assessment_criteria.json similarity index 97% rename from erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.json rename to erpnext/education/doctype/course_assessment_criteria/course_assessment_criteria.json index 73d04877a7c..2d8c0b3441e 100644 --- a/erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.json +++ b/erpnext/education/doctype/course_assessment_criteria/course_assessment_criteria.json @@ -115,9 +115,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-06-30 08:21:47.420656", + "modified": "2017-11-10 19:10:44.710837", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Course Assessment Criteria", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.py b/erpnext/education/doctype/course_assessment_criteria/course_assessment_criteria.py similarity index 100% rename from erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.py rename to erpnext/education/doctype/course_assessment_criteria/course_assessment_criteria.py diff --git a/erpnext/schools/doctype/course_schedule/__init__.py b/erpnext/education/doctype/course_schedule/__init__.py similarity index 100% rename from erpnext/schools/doctype/course_schedule/__init__.py rename to erpnext/education/doctype/course_schedule/__init__.py diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.js b/erpnext/education/doctype/course_schedule/course_schedule.js similarity index 92% rename from erpnext/schools/doctype/course_schedule/course_schedule.js rename to erpnext/education/doctype/course_schedule/course_schedule.js index 7778a6e6157..692c2a83892 100644 --- a/erpnext/schools/doctype/course_schedule/course_schedule.js +++ b/erpnext/education/doctype/course_schedule/course_schedule.js @@ -1,4 +1,4 @@ -frappe.provide("schools") +frappe.provide("education"); cur_frm.add_fetch("student_group", "course", "course") frappe.ui.form.on("Course Schedule", { diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.json b/erpnext/education/doctype/course_schedule/course_schedule.json similarity index 99% rename from erpnext/schools/doctype/course_schedule/course_schedule.json rename to erpnext/education/doctype/course_schedule/course_schedule.json index 68ef2334f3e..9049a80bd9d 100644 --- a/erpnext/schools/doctype/course_schedule/course_schedule.json +++ b/erpnext/education/doctype/course_schedule/course_schedule.json @@ -420,9 +420,9 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-06-30 08:21:47.516781", + "modified": "2017-11-10 19:10:28.797143", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Course Schedule", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.py b/erpnext/education/doctype/course_schedule/course_schedule.py similarity index 96% rename from erpnext/schools/doctype/course_schedule/course_schedule.py rename to erpnext/education/doctype/course_schedule/course_schedule.py index 845f5f5f92c..5083ff6589d 100644 --- a/erpnext/schools/doctype/course_schedule/course_schedule.py +++ b/erpnext/education/doctype/course_schedule/course_schedule.py @@ -32,7 +32,7 @@ class CourseSchedule(Document): def validate_overlap(self): """Validates overlap for Student Group, Instructor, Room""" - from erpnext.schools.utils import validate_overlap_for + from erpnext.education.utils import validate_overlap_for #Validate overlapping course schedules. if self.student_group: diff --git a/erpnext/schools/doctype/course_schedule/course_schedule_calendar.js b/erpnext/education/doctype/course_schedule/course_schedule_calendar.js similarity index 91% rename from erpnext/schools/doctype/course_schedule/course_schedule_calendar.js rename to erpnext/education/doctype/course_schedule/course_schedule_calendar.js index 94ce7208949..c11405de2ba 100644 --- a/erpnext/schools/doctype/course_schedule/course_schedule_calendar.js +++ b/erpnext/education/doctype/course_schedule/course_schedule_calendar.js @@ -34,5 +34,5 @@ frappe.views.calendar["Course Schedule"] = { "label": __("Room") } ], - get_events_method: "erpnext.schools.api.get_course_schedule_events" + get_events_method: "erpnext.education.api.get_course_schedule_events" } diff --git a/erpnext/education/doctype/course_schedule/test_course_schedule.js b/erpnext/education/doctype/course_schedule/test_course_schedule.js new file mode 100644 index 00000000000..5cdb67be482 --- /dev/null +++ b/erpnext/education/doctype/course_schedule/test_course_schedule.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Course Schedule", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Course Schedule + () => frappe.tests.make('Course Schedule', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/schools/doctype/course_schedule/test_course_schedule.py b/erpnext/education/doctype/course_schedule/test_course_schedule.py similarity index 98% rename from erpnext/schools/doctype/course_schedule/test_course_schedule.py rename to erpnext/education/doctype/course_schedule/test_course_schedule.py index f1313820a5f..9ba6bd3e4b1 100644 --- a/erpnext/schools/doctype/course_schedule/test_course_schedule.py +++ b/erpnext/education/doctype/course_schedule/test_course_schedule.py @@ -8,7 +8,7 @@ import unittest import datetime from frappe.utils import today, to_timedelta -from erpnext.schools.utils import OverlapError +from erpnext.education.utils import OverlapError # test_records = frappe.get_test_records('Course Schedule') diff --git a/erpnext/schools/doctype/course_scheduling_tool/__init__.py b/erpnext/education/doctype/course_scheduling_tool/__init__.py similarity index 100% rename from erpnext/schools/doctype/course_scheduling_tool/__init__.py rename to erpnext/education/doctype/course_scheduling_tool/__init__.py diff --git a/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js b/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js similarity index 100% rename from erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js rename to erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js diff --git a/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.json b/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.json similarity index 99% rename from erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.json rename to erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.json index 9bb99d75a13..11932fe9cf8 100644 --- a/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.json +++ b/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.json @@ -604,7 +604,7 @@ "menu_index": 0, "modified": "2017-11-21 16:47:58.091740", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Course Scheduling Tool", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py b/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.py similarity index 98% rename from erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py rename to erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.py index 647d34b65e2..97c29ab667d 100644 --- a/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +++ b/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.py @@ -8,7 +8,7 @@ import calendar from frappe import _ from frappe.model.document import Document from frappe.utils import add_days, getdate -from erpnext.schools.utils import OverlapError +from erpnext.education.utils import OverlapError class CourseSchedulingTool(Document): diff --git a/erpnext/education/doctype/course_scheduling_tool/test_course_scheduling_tool.js b/erpnext/education/doctype/course_scheduling_tool/test_course_scheduling_tool.js new file mode 100644 index 00000000000..4419d181167 --- /dev/null +++ b/erpnext/education/doctype/course_scheduling_tool/test_course_scheduling_tool.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Course Scheduling Tool", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Course Scheduling Tool + () => frappe.tests.make('Course Scheduling Tool', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/education/doctype/course_scheduling_tool/test_course_scheduling_tool.py b/erpnext/education/doctype/course_scheduling_tool/test_course_scheduling_tool.py new file mode 100644 index 00000000000..d921f8e0e15 --- /dev/null +++ b/erpnext/education/doctype/course_scheduling_tool/test_course_scheduling_tool.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestCourseSchedulingTool(unittest.TestCase): + pass diff --git a/erpnext/schools/doctype/fee_category/__init__.py b/erpnext/education/doctype/education_settings/__init__.py similarity index 100% rename from erpnext/schools/doctype/fee_category/__init__.py rename to erpnext/education/doctype/education_settings/__init__.py diff --git a/erpnext/schools/doctype/school_settings/school_settings.js b/erpnext/education/doctype/education_settings/education_settings.js similarity index 78% rename from erpnext/schools/doctype/school_settings/school_settings.js rename to erpnext/education/doctype/education_settings/education_settings.js index 2707c428768..764d8b4a7f4 100644 --- a/erpnext/schools/doctype/school_settings/school_settings.js +++ b/erpnext/education/doctype/education_settings/education_settings.js @@ -1,7 +1,7 @@ // Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors // For license information, please see license.txt -frappe.ui.form.on('School Settings', { +frappe.ui.form.on('Education Settings', { refresh: function(frm) { } diff --git a/erpnext/schools/doctype/school_settings/school_settings.json b/erpnext/education/doctype/education_settings/education_settings.json similarity index 98% rename from erpnext/schools/doctype/school_settings/school_settings.json rename to erpnext/education/doctype/education_settings/education_settings.json index b6d9890ebd2..2771ad69c30 100644 --- a/erpnext/schools/doctype/school_settings/school_settings.json +++ b/erpnext/education/doctype/education_settings/education_settings.json @@ -267,10 +267,10 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2017-08-25 02:36:48.744456", + "modified": "2017-11-16 13:23:06.124735", "modified_by": "Administrator", - "module": "Schools", - "name": "School Settings", + "module": "Education", + "name": "Education Settings", "name_case": "", "owner": "Administrator", "permissions": [ diff --git a/erpnext/schools/doctype/school_settings/school_settings.py b/erpnext/education/doctype/education_settings/education_settings.py similarity index 85% rename from erpnext/schools/doctype/school_settings/school_settings.py rename to erpnext/education/doctype/education_settings/education_settings.py index 88235cfc349..9286efa7c49 100644 --- a/erpnext/schools/doctype/school_settings/school_settings.py +++ b/erpnext/education/doctype/education_settings/education_settings.py @@ -7,7 +7,7 @@ import frappe import frappe.defaults from frappe.model.document import Document -school_keydict = { +education_keydict = { # "key in defaults": "key in Global Defaults" "academic_year": "current_academic_year", "academic_term": "current_academic_term", @@ -15,11 +15,12 @@ school_keydict = { "validate_course": "validate_course" } -class SchoolSettings(Document): + +class EducationSettings(Document): def on_update(self): """update defaults""" - for key in school_keydict: - frappe.db.set_default(key, self.get(school_keydict[key], '')) + for key in education_keydict: + frappe.db.set_default(key, self.get(education_keydict[key], '')) # clear cache frappe.clear_cache() diff --git a/erpnext/schools/doctype/school_settings/test_school_settings.js b/erpnext/education/doctype/education_settings/test_education_settings.js similarity index 64% rename from erpnext/schools/doctype/school_settings/test_school_settings.js rename to erpnext/education/doctype/education_settings/test_education_settings.js index 641405684c1..990b0aa2a46 100644 --- a/erpnext/schools/doctype/school_settings/test_school_settings.js +++ b/erpnext/education/doctype/education_settings/test_education_settings.js @@ -1,11 +1,17 @@ -// Testing Setup Module in Schools -QUnit.module('schools'); +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line -QUnit.test("Test: School Settings", function(assert){ - assert.expect(3); +// Testing Setup Module in Education +QUnit.module('education'); + +QUnit.test("test: Education Settings", function (assert) { let done = assert.async(); + + assert.expect(3); + frappe.run_serially([ - () => frappe.set_route("List", "School Settings"), + () => frappe.set_route("List", "Education Settings"), () => frappe.timeout(0.4), () => { return frappe.tests.set_form_values(cur_frm, [ @@ -22,4 +28,4 @@ QUnit.test("Test: School Settings", function(assert){ }, () => done() ]); -}); \ No newline at end of file +}); diff --git a/erpnext/education/doctype/education_settings/test_education_settings.py b/erpnext/education/doctype/education_settings/test_education_settings.py new file mode 100644 index 00000000000..038fb6e57e1 --- /dev/null +++ b/erpnext/education/doctype/education_settings/test_education_settings.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestEducationSettings(unittest.TestCase): + pass diff --git a/erpnext/schools/doctype/fee_component/__init__.py b/erpnext/education/doctype/fee_category/__init__.py similarity index 100% rename from erpnext/schools/doctype/fee_component/__init__.py rename to erpnext/education/doctype/fee_category/__init__.py diff --git a/erpnext/schools/doctype/fee_category/fee_category.js b/erpnext/education/doctype/fee_category/fee_category.js similarity index 100% rename from erpnext/schools/doctype/fee_category/fee_category.js rename to erpnext/education/doctype/fee_category/fee_category.js diff --git a/erpnext/schools/doctype/fee_category/fee_category.json b/erpnext/education/doctype/fee_category/fee_category.json similarity index 98% rename from erpnext/schools/doctype/fee_category/fee_category.json rename to erpnext/education/doctype/fee_category/fee_category.json index 2b55f8d87a2..c1bfa8e8369 100644 --- a/erpnext/schools/doctype/fee_category/fee_category.json +++ b/erpnext/education/doctype/fee_category/fee_category.json @@ -90,9 +90,9 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-11-02 17:57:18.069158", + "modified": "2017-11-10 18:56:33.824534", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Fee Category", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/fee_category/fee_category.py b/erpnext/education/doctype/fee_category/fee_category.py similarity index 100% rename from erpnext/schools/doctype/fee_category/fee_category.py rename to erpnext/education/doctype/fee_category/fee_category.py diff --git a/erpnext/education/doctype/fee_category/test_fee_category.js b/erpnext/education/doctype/fee_category/test_fee_category.js new file mode 100644 index 00000000000..a08ed33e8b6 --- /dev/null +++ b/erpnext/education/doctype/fee_category/test_fee_category.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Fee Category", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Fee Category + () => frappe.tests.make('Fee Category', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/schools/doctype/fee_category/test_fee_category.py b/erpnext/education/doctype/fee_category/test_fee_category.py similarity index 100% rename from erpnext/schools/doctype/fee_category/test_fee_category.py rename to erpnext/education/doctype/fee_category/test_fee_category.py diff --git a/erpnext/schools/doctype/fee_category/test_records.json b/erpnext/education/doctype/fee_category/test_records.json similarity index 100% rename from erpnext/schools/doctype/fee_category/test_records.json rename to erpnext/education/doctype/fee_category/test_records.json diff --git a/erpnext/schools/doctype/fee_schedule/__init__.py b/erpnext/education/doctype/fee_component/__init__.py similarity index 100% rename from erpnext/schools/doctype/fee_schedule/__init__.py rename to erpnext/education/doctype/fee_component/__init__.py diff --git a/erpnext/schools/doctype/fee_component/fee_component.json b/erpnext/education/doctype/fee_component/fee_component.json similarity index 98% rename from erpnext/schools/doctype/fee_component/fee_component.json rename to erpnext/education/doctype/fee_component/fee_component.json index ccf1f659db6..f6e13c48b20 100644 --- a/erpnext/schools/doctype/fee_component/fee_component.json +++ b/erpnext/education/doctype/fee_component/fee_component.json @@ -150,9 +150,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-09-11 16:48:07.810959", + "modified": "2017-11-10 18:58:10.254407", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Fee Component", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/fee_component/fee_component.py b/erpnext/education/doctype/fee_component/fee_component.py similarity index 100% rename from erpnext/schools/doctype/fee_component/fee_component.py rename to erpnext/education/doctype/fee_component/fee_component.py diff --git a/erpnext/schools/doctype/fee_schedule_program/__init__.py b/erpnext/education/doctype/fee_schedule/__init__.py similarity index 100% rename from erpnext/schools/doctype/fee_schedule_program/__init__.py rename to erpnext/education/doctype/fee_schedule/__init__.py diff --git a/erpnext/schools/doctype/fee_schedule/fee_schedule.js b/erpnext/education/doctype/fee_schedule/fee_schedule.js similarity index 95% rename from erpnext/schools/doctype/fee_schedule/fee_schedule.js rename to erpnext/education/doctype/fee_schedule/fee_schedule.js index d834b887d94..a560ea7e32a 100644 --- a/erpnext/schools/doctype/fee_schedule/fee_schedule.js +++ b/erpnext/education/doctype/fee_schedule/fee_schedule.js @@ -78,7 +78,7 @@ frappe.ui.form.on('Fee Schedule', { fee_structure: function(frm) { if (frm.doc.fee_structure) { frappe.call({ - method: "erpnext.schools.doctype.fee_schedule.fee_schedule.get_fee_structure", + method: "erpnext.education.doctype.fee_schedule.fee_schedule.get_fee_structure", args: { "target_doc": frm.doc.name, "source_name": frm.doc.fee_structure @@ -96,7 +96,7 @@ frappe.ui.form.on("Fee Schedule Student Group", { student_group: function(frm, cdt, cdn) { var row = locals[cdt][cdn]; frappe.call({ - method: "erpnext.schools.doctype.fee_schedule.fee_schedule.get_total_students", + method: "erpnext.education.doctype.fee_schedule.fee_schedule.get_total_students", args: { "student_group": row.student_group, "academic_year": frm.doc.academic_year, diff --git a/erpnext/schools/doctype/fee_schedule/fee_schedule.json b/erpnext/education/doctype/fee_schedule/fee_schedule.json similarity index 99% rename from erpnext/schools/doctype/fee_schedule/fee_schedule.json rename to erpnext/education/doctype/fee_schedule/fee_schedule.json index ab609112a1f..a1ea9bd4cd2 100644 --- a/erpnext/schools/doctype/fee_schedule/fee_schedule.json +++ b/erpnext/education/doctype/fee_schedule/fee_schedule.json @@ -1029,9 +1029,9 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-11-02 17:55:22.851581", + "modified": "2017-11-10 18:56:46.330631", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Fee Schedule", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/fee_schedule/fee_schedule.py b/erpnext/education/doctype/fee_schedule/fee_schedule.py similarity index 100% rename from erpnext/schools/doctype/fee_schedule/fee_schedule.py rename to erpnext/education/doctype/fee_schedule/fee_schedule.py diff --git a/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js b/erpnext/education/doctype/fee_schedule/fee_schedule_list.js similarity index 100% rename from erpnext/schools/doctype/fee_schedule/fee_schedule_list.js rename to erpnext/education/doctype/fee_schedule/fee_schedule_list.js diff --git a/erpnext/schools/doctype/fee_schedule/test_fee_schedule.js b/erpnext/education/doctype/fee_schedule/test_fee_schedule.js similarity index 100% rename from erpnext/schools/doctype/fee_schedule/test_fee_schedule.js rename to erpnext/education/doctype/fee_schedule/test_fee_schedule.js diff --git a/erpnext/schools/doctype/fee_schedule/test_fee_schedule.py b/erpnext/education/doctype/fee_schedule/test_fee_schedule.py similarity index 100% rename from erpnext/schools/doctype/fee_schedule/test_fee_schedule.py rename to erpnext/education/doctype/fee_schedule/test_fee_schedule.py diff --git a/erpnext/schools/doctype/fee_schedule_student_group/__init__.py b/erpnext/education/doctype/fee_schedule_program/__init__.py similarity index 100% rename from erpnext/schools/doctype/fee_schedule_student_group/__init__.py rename to erpnext/education/doctype/fee_schedule_program/__init__.py diff --git a/erpnext/schools/doctype/fee_schedule_program/fee_schedule_program.json b/erpnext/education/doctype/fee_schedule_program/fee_schedule_program.json similarity index 97% rename from erpnext/schools/doctype/fee_schedule_program/fee_schedule_program.json rename to erpnext/education/doctype/fee_schedule_program/fee_schedule_program.json index 42cc7bfcd89..e9a5c12f7f2 100644 --- a/erpnext/schools/doctype/fee_schedule_program/fee_schedule_program.json +++ b/erpnext/education/doctype/fee_schedule_program/fee_schedule_program.json @@ -115,9 +115,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-08-22 16:24:40.547517", + "modified": "2017-11-10 19:09:02.326827", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Fee Schedule Program", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/fee_schedule_program/fee_schedule_program.py b/erpnext/education/doctype/fee_schedule_program/fee_schedule_program.py similarity index 100% rename from erpnext/schools/doctype/fee_schedule_program/fee_schedule_program.py rename to erpnext/education/doctype/fee_schedule_program/fee_schedule_program.py diff --git a/erpnext/schools/doctype/fee_structure/__init__.py b/erpnext/education/doctype/fee_schedule_student_group/__init__.py similarity index 100% rename from erpnext/schools/doctype/fee_structure/__init__.py rename to erpnext/education/doctype/fee_schedule_student_group/__init__.py diff --git a/erpnext/schools/doctype/fee_schedule_student_group/fee_schedule_student_group.json b/erpnext/education/doctype/fee_schedule_student_group/fee_schedule_student_group.json similarity index 96% rename from erpnext/schools/doctype/fee_schedule_student_group/fee_schedule_student_group.json rename to erpnext/education/doctype/fee_schedule_student_group/fee_schedule_student_group.json index c80e32087c9..aed1ae51b24 100644 --- a/erpnext/schools/doctype/fee_schedule_student_group/fee_schedule_student_group.json +++ b/erpnext/education/doctype/fee_schedule_student_group/fee_schedule_student_group.json @@ -84,9 +84,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-08-22 16:23:12.337294", + "modified": "2017-11-10 19:09:19.498184", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Fee Schedule Student Group", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/fee_schedule_student_group/fee_schedule_student_group.py b/erpnext/education/doctype/fee_schedule_student_group/fee_schedule_student_group.py similarity index 100% rename from erpnext/schools/doctype/fee_schedule_student_group/fee_schedule_student_group.py rename to erpnext/education/doctype/fee_schedule_student_group/fee_schedule_student_group.py diff --git a/erpnext/schools/doctype/fees/__init__.py b/erpnext/education/doctype/fee_structure/__init__.py similarity index 100% rename from erpnext/schools/doctype/fees/__init__.py rename to erpnext/education/doctype/fee_structure/__init__.py diff --git a/erpnext/schools/doctype/fee_structure/fee_structure.js b/erpnext/education/doctype/fee_structure/fee_structure.js similarity index 93% rename from erpnext/schools/doctype/fee_structure/fee_structure.js rename to erpnext/education/doctype/fee_structure/fee_structure.js index 300bdc869f3..812456c2bd8 100644 --- a/erpnext/schools/doctype/fee_structure/fee_structure.js +++ b/erpnext/education/doctype/fee_structure/fee_structure.js @@ -39,7 +39,7 @@ frappe.ui.form.on('Fee Structure', { make_fee_schedule: function(frm) { frappe.model.open_mapped_doc({ - method: "erpnext.schools.doctype.fee_structure.fee_structure.make_fee_schedule", + method: "erpnext.education.doctype.fee_structure.fee_structure.make_fee_schedule", frm: frm }); } diff --git a/erpnext/schools/doctype/fee_structure/fee_structure.json b/erpnext/education/doctype/fee_structure/fee_structure.json similarity index 99% rename from erpnext/schools/doctype/fee_structure/fee_structure.json rename to erpnext/education/doctype/fee_structure/fee_structure.json index 2ae0a488bb4..428b1b19163 100644 --- a/erpnext/schools/doctype/fee_structure/fee_structure.json +++ b/erpnext/education/doctype/fee_structure/fee_structure.json @@ -577,9 +577,9 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-11-02 17:43:16.796845", + "modified": "2017-11-10 18:56:59.698192", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Fee Structure", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/fee_structure/fee_structure.py b/erpnext/education/doctype/fee_structure/fee_structure.py similarity index 100% rename from erpnext/schools/doctype/fee_structure/fee_structure.py rename to erpnext/education/doctype/fee_structure/fee_structure.py diff --git a/erpnext/schools/doctype/fee_structure/test_fee_structure.js b/erpnext/education/doctype/fee_structure/test_fee_structure.js similarity index 100% rename from erpnext/schools/doctype/fee_structure/test_fee_structure.js rename to erpnext/education/doctype/fee_structure/test_fee_structure.js diff --git a/erpnext/schools/doctype/fee_structure/test_fee_structure.py b/erpnext/education/doctype/fee_structure/test_fee_structure.py similarity index 100% rename from erpnext/schools/doctype/fee_structure/test_fee_structure.py rename to erpnext/education/doctype/fee_structure/test_fee_structure.py diff --git a/erpnext/schools/doctype/fee_structure/test_records.json b/erpnext/education/doctype/fee_structure/test_records.json similarity index 100% rename from erpnext/schools/doctype/fee_structure/test_records.json rename to erpnext/education/doctype/fee_structure/test_records.json diff --git a/erpnext/schools/doctype/grading_scale/__init__.py b/erpnext/education/doctype/fees/__init__.py similarity index 100% rename from erpnext/schools/doctype/grading_scale/__init__.py rename to erpnext/education/doctype/fees/__init__.py diff --git a/erpnext/schools/doctype/fees/fees.js b/erpnext/education/doctype/fees/fees.js similarity index 97% rename from erpnext/schools/doctype/fees/fees.js rename to erpnext/education/doctype/fees/fees.js index 4347308740c..2a7218a7759 100644 --- a/erpnext/schools/doctype/fees/fees.js +++ b/erpnext/education/doctype/fees/fees.js @@ -84,7 +84,7 @@ frappe.ui.form.on("Fees", { student: function(frm) { if (frm.doc.student) { frappe.call({ - method:"erpnext.schools.api.get_current_enrollment", + method:"erpnext.education.api.get_current_enrollment", args: { "student": frm.doc.student, "academic_year": frm.doc.academic_year @@ -147,7 +147,7 @@ frappe.ui.form.on("Fees", { frm.set_value("components" ,""); if (frm.doc.fee_structure) { frappe.call({ - method: "erpnext.schools.api.get_fee_components", + method: "erpnext.education.api.get_fee_components", args: { "fee_structure": frm.doc.fee_structure }, diff --git a/erpnext/schools/doctype/fees/fees.json b/erpnext/education/doctype/fees/fees.json similarity index 99% rename from erpnext/schools/doctype/fees/fees.json rename to erpnext/education/doctype/fees/fees.json index f34caf77c40..85c24719bba 100644 --- a/erpnext/schools/doctype/fees/fees.json +++ b/erpnext/education/doctype/fees/fees.json @@ -1305,9 +1305,9 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-11-02 17:31:47.155873", + "modified": "2017-11-10 18:57:12.021112", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Fees", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/fees/fees.py b/erpnext/education/doctype/fees/fees.py similarity index 100% rename from erpnext/schools/doctype/fees/fees.py rename to erpnext/education/doctype/fees/fees.py diff --git a/erpnext/schools/doctype/fees/fees_list.js b/erpnext/education/doctype/fees/fees_list.js similarity index 100% rename from erpnext/schools/doctype/fees/fees_list.js rename to erpnext/education/doctype/fees/fees_list.js diff --git a/erpnext/schools/doctype/fees/test_fees.js b/erpnext/education/doctype/fees/test_fees.js similarity index 100% rename from erpnext/schools/doctype/fees/test_fees.js rename to erpnext/education/doctype/fees/test_fees.js diff --git a/erpnext/schools/doctype/fees/test_fees.py b/erpnext/education/doctype/fees/test_fees.py similarity index 100% rename from erpnext/schools/doctype/fees/test_fees.py rename to erpnext/education/doctype/fees/test_fees.py diff --git a/erpnext/schools/doctype/grading_scale_interval/__init__.py b/erpnext/education/doctype/grading_scale/__init__.py similarity index 100% rename from erpnext/schools/doctype/grading_scale_interval/__init__.py rename to erpnext/education/doctype/grading_scale/__init__.py diff --git a/erpnext/schools/doctype/grading_scale/grading_scale.js b/erpnext/education/doctype/grading_scale/grading_scale.js similarity index 100% rename from erpnext/schools/doctype/grading_scale/grading_scale.js rename to erpnext/education/doctype/grading_scale/grading_scale.js diff --git a/erpnext/schools/doctype/grading_scale/grading_scale.json b/erpnext/education/doctype/grading_scale/grading_scale.json similarity index 98% rename from erpnext/schools/doctype/grading_scale/grading_scale.json rename to erpnext/education/doctype/grading_scale/grading_scale.json index fdaa8c6f486..67fef3e2c51 100644 --- a/erpnext/schools/doctype/grading_scale/grading_scale.json +++ b/erpnext/education/doctype/grading_scale/grading_scale.json @@ -175,9 +175,9 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-06-30 08:21:48.413400", + "modified": "2017-11-10 19:07:22.001040", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Grading Scale", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/grading_scale/grading_scale.py b/erpnext/education/doctype/grading_scale/grading_scale.py similarity index 100% rename from erpnext/schools/doctype/grading_scale/grading_scale.py rename to erpnext/education/doctype/grading_scale/grading_scale.py diff --git a/erpnext/schools/doctype/grading_scale/test_grading_scale.js b/erpnext/education/doctype/grading_scale/test_grading_scale.js similarity index 97% rename from erpnext/schools/doctype/grading_scale/test_grading_scale.js rename to erpnext/education/doctype/grading_scale/test_grading_scale.js index c6869245be0..e363545ff8d 100644 --- a/erpnext/schools/doctype/grading_scale/test_grading_scale.js +++ b/erpnext/education/doctype/grading_scale/test_grading_scale.js @@ -1,5 +1,5 @@ -// School Assessment module -QUnit.module('schools'); +// Education Assessment module +QUnit.module('education'); QUnit.test('Test: Grading Scale', function(assert){ assert.expect(3); diff --git a/erpnext/schools/doctype/grading_scale/test_grading_scale.py b/erpnext/education/doctype/grading_scale/test_grading_scale.py similarity index 100% rename from erpnext/schools/doctype/grading_scale/test_grading_scale.py rename to erpnext/education/doctype/grading_scale/test_grading_scale.py diff --git a/erpnext/schools/doctype/grading_scale/test_records.json b/erpnext/education/doctype/grading_scale/test_records.json similarity index 100% rename from erpnext/schools/doctype/grading_scale/test_records.json rename to erpnext/education/doctype/grading_scale/test_records.json diff --git a/erpnext/schools/doctype/guardian/__init__.py b/erpnext/education/doctype/grading_scale_interval/__init__.py similarity index 100% rename from erpnext/schools/doctype/guardian/__init__.py rename to erpnext/education/doctype/grading_scale_interval/__init__.py diff --git a/erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.json b/erpnext/education/doctype/grading_scale_interval/grading_scale_interval.json similarity index 97% rename from erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.json rename to erpnext/education/doctype/grading_scale_interval/grading_scale_interval.json index cee83e3fcf5..5574e1da549 100644 --- a/erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.json +++ b/erpnext/education/doctype/grading_scale_interval/grading_scale_interval.json @@ -114,9 +114,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-06-30 08:21:48.532524", + "modified": "2017-11-10 19:08:48.083084", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Grading Scale Interval", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.py b/erpnext/education/doctype/grading_scale_interval/grading_scale_interval.py similarity index 100% rename from erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.py rename to erpnext/education/doctype/grading_scale_interval/grading_scale_interval.py diff --git a/erpnext/schools/doctype/guardian_interest/__init__.py b/erpnext/education/doctype/guardian/__init__.py similarity index 100% rename from erpnext/schools/doctype/guardian_interest/__init__.py rename to erpnext/education/doctype/guardian/__init__.py diff --git a/erpnext/schools/doctype/guardian/guardian.js b/erpnext/education/doctype/guardian/guardian.js similarity index 100% rename from erpnext/schools/doctype/guardian/guardian.js rename to erpnext/education/doctype/guardian/guardian.js diff --git a/erpnext/schools/doctype/guardian/guardian.json b/erpnext/education/doctype/guardian/guardian.json similarity index 99% rename from erpnext/schools/doctype/guardian/guardian.json rename to erpnext/education/doctype/guardian/guardian.json index bc4cf4f64f5..500b747eb93 100644 --- a/erpnext/schools/doctype/guardian/guardian.json +++ b/erpnext/education/doctype/guardian/guardian.json @@ -476,9 +476,9 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-06-30 08:21:48.630678", + "modified": "2017-11-10 19:06:57.122193", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Guardian", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/guardian/guardian.py b/erpnext/education/doctype/guardian/guardian.py similarity index 100% rename from erpnext/schools/doctype/guardian/guardian.py rename to erpnext/education/doctype/guardian/guardian.py diff --git a/erpnext/schools/doctype/guardian/test_guardian.js b/erpnext/education/doctype/guardian/test_guardian.js similarity index 93% rename from erpnext/schools/doctype/guardian/test_guardian.js rename to erpnext/education/doctype/guardian/test_guardian.js index a16ba0836dc..9bbfacd5802 100644 --- a/erpnext/schools/doctype/guardian/test_guardian.js +++ b/erpnext/education/doctype/guardian/test_guardian.js @@ -1,5 +1,5 @@ -// Testing Student Module in Schools -QUnit.module('schools'); +// Testing Student Module in education +QUnit.module('education'); QUnit.test('Test: Guardian', function(assert){ assert.expect(9); diff --git a/erpnext/schools/doctype/guardian/test_guardian.py b/erpnext/education/doctype/guardian/test_guardian.py similarity index 100% rename from erpnext/schools/doctype/guardian/test_guardian.py rename to erpnext/education/doctype/guardian/test_guardian.py diff --git a/erpnext/schools/doctype/guardian_student/__init__.py b/erpnext/education/doctype/guardian_interest/__init__.py similarity index 100% rename from erpnext/schools/doctype/guardian_student/__init__.py rename to erpnext/education/doctype/guardian_interest/__init__.py diff --git a/erpnext/schools/doctype/guardian_interest/guardian_interest.json b/erpnext/education/doctype/guardian_interest/guardian_interest.json similarity index 95% rename from erpnext/schools/doctype/guardian_interest/guardian_interest.json rename to erpnext/education/doctype/guardian_interest/guardian_interest.json index aae2c557588..1995c551dba 100644 --- a/erpnext/schools/doctype/guardian_interest/guardian_interest.json +++ b/erpnext/education/doctype/guardian_interest/guardian_interest.json @@ -53,9 +53,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-06-30 08:21:48.827806", + "modified": "2017-11-10 19:10:22.333454", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Guardian Interest", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/guardian_interest/guardian_interest.py b/erpnext/education/doctype/guardian_interest/guardian_interest.py similarity index 100% rename from erpnext/schools/doctype/guardian_interest/guardian_interest.py rename to erpnext/education/doctype/guardian_interest/guardian_interest.py diff --git a/erpnext/schools/doctype/instructor/__init__.py b/erpnext/education/doctype/guardian_student/__init__.py similarity index 100% rename from erpnext/schools/doctype/instructor/__init__.py rename to erpnext/education/doctype/guardian_student/__init__.py diff --git a/erpnext/schools/doctype/guardian_student/guardian_student.json b/erpnext/education/doctype/guardian_student/guardian_student.json similarity index 97% rename from erpnext/schools/doctype/guardian_student/guardian_student.json rename to erpnext/education/doctype/guardian_student/guardian_student.json index 4242c9de857..2519a54af8b 100644 --- a/erpnext/schools/doctype/guardian_student/guardian_student.json +++ b/erpnext/education/doctype/guardian_student/guardian_student.json @@ -113,9 +113,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-06-30 08:21:48.957516", + "modified": "2017-11-10 19:10:15.786362", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Guardian Student", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/guardian_student/guardian_student.py b/erpnext/education/doctype/guardian_student/guardian_student.py similarity index 100% rename from erpnext/schools/doctype/guardian_student/guardian_student.py rename to erpnext/education/doctype/guardian_student/guardian_student.py diff --git a/erpnext/schools/doctype/program/__init__.py b/erpnext/education/doctype/instructor/__init__.py similarity index 100% rename from erpnext/schools/doctype/program/__init__.py rename to erpnext/education/doctype/instructor/__init__.py diff --git a/erpnext/schools/doctype/instructor/instructor.js b/erpnext/education/doctype/instructor/instructor.js similarity index 100% rename from erpnext/schools/doctype/instructor/instructor.js rename to erpnext/education/doctype/instructor/instructor.js diff --git a/erpnext/schools/doctype/instructor/instructor.json b/erpnext/education/doctype/instructor/instructor.json similarity index 98% rename from erpnext/schools/doctype/instructor/instructor.json rename to erpnext/education/doctype/instructor/instructor.json index cd0b4f10f80..865e07ce216 100644 --- a/erpnext/schools/doctype/instructor/instructor.json +++ b/erpnext/education/doctype/instructor/instructor.json @@ -208,9 +208,9 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-08-25 01:03:14.602994", + "modified": "2017-11-10 19:00:20.354954", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Instructor", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/instructor/instructor.py b/erpnext/education/doctype/instructor/instructor.py similarity index 79% rename from erpnext/schools/doctype/instructor/instructor.py rename to erpnext/education/doctype/instructor/instructor.py index ba179f76aa4..44a4e4c5c58 100644 --- a/erpnext/schools/doctype/instructor/instructor.py +++ b/erpnext/education/doctype/instructor/instructor.py @@ -10,9 +10,9 @@ from frappe.model.naming import make_autoname class Instructor(Document): def autoname(self): - naming_method = frappe.db.get_value("School Settings", None, "instructor_created_by") + naming_method = frappe.db.get_value("Education Settings", None, "instructor_created_by") if not naming_method: - frappe.throw(_("Please setup Instructor Naming System in School > School Settings")) + frappe.throw(_("Please setup Instructor Naming System in Education > Education Settings")) else: if naming_method == 'Naming Series': self.name = make_autoname(self.naming_series + '.####') diff --git a/erpnext/schools/doctype/instructor/test_instructor.js b/erpnext/education/doctype/instructor/test_instructor.js similarity index 86% rename from erpnext/schools/doctype/instructor/test_instructor.js rename to erpnext/education/doctype/instructor/test_instructor.js index a9e25616c19..c584f45ccaa 100644 --- a/erpnext/schools/doctype/instructor/test_instructor.js +++ b/erpnext/education/doctype/instructor/test_instructor.js @@ -1,5 +1,5 @@ -// Testing Setup Module in Schools -QUnit.module('schools'); +// Testing Setup Module in education +QUnit.module('education'); QUnit.test('Test: Instructor', function(assert){ assert.expect(2); diff --git a/erpnext/schools/doctype/instructor/test_instructor.py b/erpnext/education/doctype/instructor/test_instructor.py similarity index 100% rename from erpnext/schools/doctype/instructor/test_instructor.py rename to erpnext/education/doctype/instructor/test_instructor.py diff --git a/erpnext/schools/doctype/instructor/test_records.json b/erpnext/education/doctype/instructor/test_records.json similarity index 100% rename from erpnext/schools/doctype/instructor/test_records.json rename to erpnext/education/doctype/instructor/test_records.json diff --git a/erpnext/schools/doctype/program_course/__init__.py b/erpnext/education/doctype/program/__init__.py similarity index 100% rename from erpnext/schools/doctype/program_course/__init__.py rename to erpnext/education/doctype/program/__init__.py diff --git a/erpnext/schools/doctype/program/program.js b/erpnext/education/doctype/program/program.js similarity index 100% rename from erpnext/schools/doctype/program/program.js rename to erpnext/education/doctype/program/program.js diff --git a/erpnext/schools/doctype/program/program.json b/erpnext/education/doctype/program/program.json similarity index 98% rename from erpnext/schools/doctype/program/program.json rename to erpnext/education/doctype/program/program.json index 46581a16ca5..05e35a2a539 100644 --- a/erpnext/schools/doctype/program/program.json +++ b/erpnext/education/doctype/program/program.json @@ -236,9 +236,9 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-11-02 18:08:20.823972", + "modified": "2017-11-10 18:56:18.413911", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Program", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/program/program.py b/erpnext/education/doctype/program/program.py similarity index 100% rename from erpnext/schools/doctype/program/program.py rename to erpnext/education/doctype/program/program.py diff --git a/erpnext/schools/doctype/program/test_program.js b/erpnext/education/doctype/program/test_program.js similarity index 92% rename from erpnext/schools/doctype/program/test_program.js rename to erpnext/education/doctype/program/test_program.js index a14fe978eb6..dc347cf1b06 100644 --- a/erpnext/schools/doctype/program/test_program.js +++ b/erpnext/education/doctype/program/test_program.js @@ -1,5 +1,5 @@ -// Testing Setup Module in Schools -QUnit.module('schools'); +// Testing Setup Module in education +QUnit.module('education'); QUnit.test('Test: Program', function(assert){ assert.expect(6); diff --git a/erpnext/schools/doctype/program/test_program.py b/erpnext/education/doctype/program/test_program.py similarity index 100% rename from erpnext/schools/doctype/program/test_program.py rename to erpnext/education/doctype/program/test_program.py diff --git a/erpnext/schools/doctype/program/test_records.json b/erpnext/education/doctype/program/test_records.json similarity index 100% rename from erpnext/schools/doctype/program/test_records.json rename to erpnext/education/doctype/program/test_records.json diff --git a/erpnext/schools/doctype/program_enrollment/__init__.py b/erpnext/education/doctype/program_course/__init__.py similarity index 100% rename from erpnext/schools/doctype/program_enrollment/__init__.py rename to erpnext/education/doctype/program_course/__init__.py diff --git a/erpnext/schools/doctype/program_course/program_course.json b/erpnext/education/doctype/program_course/program_course.json similarity index 98% rename from erpnext/schools/doctype/program_course/program_course.json rename to erpnext/education/doctype/program_course/program_course.json index 4922a95bf49..c3d45d83334 100644 --- a/erpnext/schools/doctype/program_course/program_course.json +++ b/erpnext/education/doctype/program_course/program_course.json @@ -145,9 +145,9 @@ "istable": 1, "max_attachments": 0, "menu_index": 0, - "modified": "2017-06-30 08:21:49.313349", + "modified": "2017-11-10 19:10:10.231463", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Program Course", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/program_course/program_course.py b/erpnext/education/doctype/program_course/program_course.py similarity index 100% rename from erpnext/schools/doctype/program_course/program_course.py rename to erpnext/education/doctype/program_course/program_course.py diff --git a/erpnext/schools/doctype/program_enrollment_course/__init__.py b/erpnext/education/doctype/program_enrollment/__init__.py similarity index 100% rename from erpnext/schools/doctype/program_enrollment_course/__init__.py rename to erpnext/education/doctype/program_enrollment/__init__.py diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.js b/erpnext/education/doctype/program_enrollment/program_enrollment.js similarity index 87% rename from erpnext/schools/doctype/program_enrollment/program_enrollment.js rename to erpnext/education/doctype/program_enrollment/program_enrollment.js index 89728607fcb..d35f41a54bd 100644 --- a/erpnext/schools/doctype/program_enrollment/program_enrollment.js +++ b/erpnext/education/doctype/program_enrollment/program_enrollment.js @@ -26,7 +26,7 @@ frappe.ui.form.on("Program Enrollment", { if (frm.doc.program) { frm.set_query("course", "courses", function(doc, cdt, cdn) { return{ - query: "erpnext.schools.doctype.program_enrollment.program_enrollment.get_program_courses", + query: "erpnext.education.doctype.program_enrollment.program_enrollment.get_program_courses", filters: { 'program': frm.doc.program } @@ -36,7 +36,7 @@ frappe.ui.form.on("Program Enrollment", { frm.set_query("student", function() { return{ - query: "erpnext.schools.doctype.program_enrollment.program_enrollment.get_students", + query: "erpnext.education.doctype.program_enrollment.program_enrollment.get_students", filters: { 'academic_year': frm.doc.academic_year, 'academic_term': frm.doc.academic_term @@ -49,7 +49,7 @@ frappe.ui.form.on("Program Enrollment", { frm.events.get_courses(frm); if (frm.doc.program) { frappe.call({ - method: "erpnext.schools.api.get_fee_schedule", + method: "erpnext.education.api.get_fee_schedule", args: { "program": frm.doc.program, "student_category": frm.doc.student_category diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.json b/erpnext/education/doctype/program_enrollment/program_enrollment.json similarity index 98% rename from erpnext/schools/doctype/program_enrollment/program_enrollment.json rename to erpnext/education/doctype/program_enrollment/program_enrollment.json index f8a3b9ecc8a..9badf933e77 100644 --- a/erpnext/schools/doctype/program_enrollment/program_enrollment.json +++ b/erpnext/education/doctype/program_enrollment/program_enrollment.json @@ -403,7 +403,7 @@ "label": "Mode of Transportation", "length": 0, "no_copy": 0, - "options": "\nWalking\nSchool Bus\nPublic Transport\nSelf-Driving Vehicle\nPick/Drop by Guardian", + "options": "\nWalking\nInstitute's Bus\nPublic Transport\nSelf-Driving Vehicle\nPick/Drop by Guardian", "permlevel": 0, "precision": "", "print_hide": 0, @@ -671,9 +671,9 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-07-10 18:16:15.810616", + "modified": "2017-11-16 13:20:28.650637", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Program Enrollment", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.py b/erpnext/education/doctype/program_enrollment/program_enrollment.py similarity index 98% rename from erpnext/schools/doctype/program_enrollment/program_enrollment.py rename to erpnext/education/doctype/program_enrollment/program_enrollment.py index a6f7bdfe786..79772b0d02d 100644 --- a/erpnext/schools/doctype/program_enrollment/program_enrollment.py +++ b/erpnext/education/doctype/program_enrollment/program_enrollment.py @@ -32,7 +32,7 @@ class ProgramEnrollment(Document): frappe.db.set_value("Student", self.student, "joining_date", date) def make_fee_records(self): - from erpnext.schools.api import get_fee_components + from erpnext.education.api import get_fee_components fee_list = [] for d in self.fees: fee_components = get_fee_components(d.fee_structure) diff --git a/erpnext/education/doctype/program_enrollment/test_program_enrollment.js b/erpnext/education/doctype/program_enrollment/test_program_enrollment.js new file mode 100644 index 00000000000..aea81a0714e --- /dev/null +++ b/erpnext/education/doctype/program_enrollment/test_program_enrollment.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Program Enrollment", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Program Enrollment + () => frappe.tests.make('Program Enrollment', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/schools/doctype/program_enrollment/test_program_enrollment.py b/erpnext/education/doctype/program_enrollment/test_program_enrollment.py similarity index 100% rename from erpnext/schools/doctype/program_enrollment/test_program_enrollment.py rename to erpnext/education/doctype/program_enrollment/test_program_enrollment.py diff --git a/erpnext/schools/doctype/program_enrollment_fee/__init__.py b/erpnext/education/doctype/program_enrollment_course/__init__.py similarity index 100% rename from erpnext/schools/doctype/program_enrollment_fee/__init__.py rename to erpnext/education/doctype/program_enrollment_course/__init__.py diff --git a/erpnext/schools/doctype/program_enrollment_course/program_enrollment_course.json b/erpnext/education/doctype/program_enrollment_course/program_enrollment_course.json similarity index 96% rename from erpnext/schools/doctype/program_enrollment_course/program_enrollment_course.json rename to erpnext/education/doctype/program_enrollment_course/program_enrollment_course.json index a5a26ab7ae4..87d9db3a1d5 100644 --- a/erpnext/schools/doctype/program_enrollment_course/program_enrollment_course.json +++ b/erpnext/education/doctype/program_enrollment_course/program_enrollment_course.json @@ -85,9 +85,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-06-30 08:21:49.637920", + "modified": "2017-11-10 19:11:54.272255", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Program Enrollment Course", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/program_enrollment_course/program_enrollment_course.py b/erpnext/education/doctype/program_enrollment_course/program_enrollment_course.py similarity index 100% rename from erpnext/schools/doctype/program_enrollment_course/program_enrollment_course.py rename to erpnext/education/doctype/program_enrollment_course/program_enrollment_course.py diff --git a/erpnext/schools/doctype/program_enrollment_tool/__init__.py b/erpnext/education/doctype/program_enrollment_fee/__init__.py similarity index 100% rename from erpnext/schools/doctype/program_enrollment_tool/__init__.py rename to erpnext/education/doctype/program_enrollment_fee/__init__.py diff --git a/erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.json b/erpnext/education/doctype/program_enrollment_fee/program_enrollment_fee.json similarity index 98% rename from erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.json rename to erpnext/education/doctype/program_enrollment_fee/program_enrollment_fee.json index 8d2202a8225..0af28155e29 100644 --- a/erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.json +++ b/erpnext/education/doctype/program_enrollment_fee/program_enrollment_fee.json @@ -173,9 +173,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-06-30 08:21:49.718726", + "modified": "2017-11-10 19:11:07.516632", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Program Enrollment Fee", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.py b/erpnext/education/doctype/program_enrollment_fee/program_enrollment_fee.py similarity index 100% rename from erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.py rename to erpnext/education/doctype/program_enrollment_fee/program_enrollment_fee.py diff --git a/erpnext/schools/doctype/program_enrollment_tool_student/__init__.py b/erpnext/education/doctype/program_enrollment_tool/__init__.py similarity index 100% rename from erpnext/schools/doctype/program_enrollment_tool_student/__init__.py rename to erpnext/education/doctype/program_enrollment_tool/__init__.py diff --git a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.js b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js similarity index 100% rename from erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.js rename to erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js diff --git a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.json b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.json similarity index 99% rename from erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.json rename to erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.json index 8f32df74b59..2745366f33d 100644 --- a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.json +++ b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.json @@ -328,9 +328,9 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2017-06-30 08:21:49.826296", + "modified": "2017-11-10 19:39:54.858394", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Program Enrollment Tool", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py similarity index 97% rename from erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py rename to erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py index d80f2f5c6b0..d989d9f1d29 100644 --- a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +++ b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe from frappe import _ from frappe.model.document import Document -from erpnext.schools.api import enroll_student +from erpnext.education.api import enroll_student class ProgramEnrollmentTool(Document): def get_students(self): diff --git a/erpnext/education/doctype/program_enrollment_tool/test_program_enrollment_tool.js b/erpnext/education/doctype/program_enrollment_tool/test_program_enrollment_tool.js new file mode 100644 index 00000000000..8d55104a0f3 --- /dev/null +++ b/erpnext/education/doctype/program_enrollment_tool/test_program_enrollment_tool.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Program Enrollment Tool", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Program Enrollment Tool + () => frappe.tests.make('Program Enrollment Tool', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/education/doctype/program_enrollment_tool/test_program_enrollment_tool.py b/erpnext/education/doctype/program_enrollment_tool/test_program_enrollment_tool.py new file mode 100644 index 00000000000..f22b3b1c8d4 --- /dev/null +++ b/erpnext/education/doctype/program_enrollment_tool/test_program_enrollment_tool.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestProgramEnrollmentTool(unittest.TestCase): + pass diff --git a/erpnext/schools/doctype/program_fee/__init__.py b/erpnext/education/doctype/program_enrollment_tool_student/__init__.py similarity index 100% rename from erpnext/schools/doctype/program_fee/__init__.py rename to erpnext/education/doctype/program_enrollment_tool_student/__init__.py diff --git a/erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json b/erpnext/education/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json similarity index 98% rename from erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json rename to erpnext/education/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json index 50c9ac781da..0dbe1b87a9f 100644 --- a/erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json +++ b/erpnext/education/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json @@ -145,9 +145,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-06-30 08:21:49.928790", + "modified": "2017-11-10 19:09:59.530615", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Program Enrollment Tool Student", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.py b/erpnext/education/doctype/program_enrollment_tool_student/program_enrollment_tool_student.py similarity index 100% rename from erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.py rename to erpnext/education/doctype/program_enrollment_tool_student/program_enrollment_tool_student.py diff --git a/erpnext/schools/doctype/room/__init__.py b/erpnext/education/doctype/program_fee/__init__.py similarity index 100% rename from erpnext/schools/doctype/room/__init__.py rename to erpnext/education/doctype/program_fee/__init__.py diff --git a/erpnext/schools/doctype/program_fee/program_fee.json b/erpnext/education/doctype/program_fee/program_fee.json similarity index 98% rename from erpnext/schools/doctype/program_fee/program_fee.json rename to erpnext/education/doctype/program_fee/program_fee.json index 673959afe2b..d45e4bd240c 100644 --- a/erpnext/schools/doctype/program_fee/program_fee.json +++ b/erpnext/education/doctype/program_fee/program_fee.json @@ -205,9 +205,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-06-30 08:21:50.034899", + "modified": "2017-11-10 19:07:10.426335", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Program Fee", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/program_fee/program_fee.py b/erpnext/education/doctype/program_fee/program_fee.py similarity index 100% rename from erpnext/schools/doctype/program_fee/program_fee.py rename to erpnext/education/doctype/program_fee/program_fee.py diff --git a/erpnext/schools/doctype/school_house/__init__.py b/erpnext/education/doctype/room/__init__.py similarity index 100% rename from erpnext/schools/doctype/school_house/__init__.py rename to erpnext/education/doctype/room/__init__.py diff --git a/erpnext/schools/doctype/room/room.js b/erpnext/education/doctype/room/room.js similarity index 100% rename from erpnext/schools/doctype/room/room.js rename to erpnext/education/doctype/room/room.js diff --git a/erpnext/schools/doctype/room/room.json b/erpnext/education/doctype/room/room.json similarity index 97% rename from erpnext/schools/doctype/room/room.json rename to erpnext/education/doctype/room/room.json index 8e672ccd72e..6526766205a 100644 --- a/erpnext/schools/doctype/room/room.json +++ b/erpnext/education/doctype/room/room.json @@ -114,9 +114,9 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-06-30 08:21:50.145058", + "modified": "2017-11-10 19:04:32.237051", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Room", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/room/room.py b/erpnext/education/doctype/room/room.py similarity index 100% rename from erpnext/schools/doctype/room/room.py rename to erpnext/education/doctype/room/room.py diff --git a/erpnext/schools/doctype/room/test_records.json b/erpnext/education/doctype/room/test_records.json similarity index 100% rename from erpnext/schools/doctype/room/test_records.json rename to erpnext/education/doctype/room/test_records.json diff --git a/erpnext/schools/doctype/room/test_room.js b/erpnext/education/doctype/room/test_room.js similarity index 87% rename from erpnext/schools/doctype/room/test_room.js rename to erpnext/education/doctype/room/test_room.js index 0a93a8553f7..fdcbe92c17c 100644 --- a/erpnext/schools/doctype/room/test_room.js +++ b/erpnext/education/doctype/room/test_room.js @@ -1,5 +1,5 @@ -// Testing Setup Module in Schools -QUnit.module('schools'); +// Testing Setup Module in Education +QUnit.module('education'); QUnit.test('Test: Room', function(assert){ assert.expect(3); diff --git a/erpnext/schools/doctype/room/test_room.py b/erpnext/education/doctype/room/test_room.py similarity index 100% rename from erpnext/schools/doctype/room/test_room.py rename to erpnext/education/doctype/room/test_room.py diff --git a/erpnext/schools/doctype/school_settings/__init__.py b/erpnext/education/doctype/school_house/__init__.py similarity index 100% rename from erpnext/schools/doctype/school_settings/__init__.py rename to erpnext/education/doctype/school_house/__init__.py diff --git a/erpnext/schools/doctype/school_house/school_house.js b/erpnext/education/doctype/school_house/school_house.js similarity index 100% rename from erpnext/schools/doctype/school_house/school_house.js rename to erpnext/education/doctype/school_house/school_house.js diff --git a/erpnext/schools/doctype/school_house/school_house.json b/erpnext/education/doctype/school_house/school_house.json similarity index 96% rename from erpnext/schools/doctype/school_house/school_house.json rename to erpnext/education/doctype/school_house/school_house.json index e7779396a38..8a653a9730c 100644 --- a/erpnext/schools/doctype/school_house/school_house.json +++ b/erpnext/education/doctype/school_house/school_house.json @@ -54,9 +54,9 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-06-30 08:21:50.250616", + "modified": "2017-11-10 19:05:06.419022", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "School House", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/school_house/school_house.py b/erpnext/education/doctype/school_house/school_house.py similarity index 100% rename from erpnext/schools/doctype/school_house/school_house.py rename to erpnext/education/doctype/school_house/school_house.py diff --git a/erpnext/education/doctype/school_house/test_school_house.js b/erpnext/education/doctype/school_house/test_school_house.js new file mode 100644 index 00000000000..dde63ecc4c6 --- /dev/null +++ b/erpnext/education/doctype/school_house/test_school_house.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: School House", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new School House + () => frappe.tests.make('School House', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/schools/doctype/school_house/test_school_house.py b/erpnext/education/doctype/school_house/test_school_house.py similarity index 100% rename from erpnext/schools/doctype/school_house/test_school_house.py rename to erpnext/education/doctype/school_house/test_school_house.py diff --git a/erpnext/schools/doctype/student/__init__.py b/erpnext/education/doctype/student/__init__.py similarity index 100% rename from erpnext/schools/doctype/student/__init__.py rename to erpnext/education/doctype/student/__init__.py diff --git a/erpnext/schools/doctype/student/student.js b/erpnext/education/doctype/student/student.js similarity index 100% rename from erpnext/schools/doctype/student/student.js rename to erpnext/education/doctype/student/student.js diff --git a/erpnext/schools/doctype/student/student.json b/erpnext/education/doctype/student/student.json similarity index 99% rename from erpnext/schools/doctype/student/student.json rename to erpnext/education/doctype/student/student.json index 4961c2db8a8..62c21d3df50 100644 --- a/erpnext/schools/doctype/student/student.json +++ b/erpnext/education/doctype/student/student.json @@ -1114,9 +1114,9 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-07-26 19:46:26.893441", + "modified": "2017-11-10 19:03:36.495785", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/student/student.py b/erpnext/education/doctype/student/student.py similarity index 100% rename from erpnext/schools/doctype/student/student.py rename to erpnext/education/doctype/student/student.py diff --git a/erpnext/schools/doctype/student/student_dashboard.py b/erpnext/education/doctype/student/student_dashboard.py similarity index 100% rename from erpnext/schools/doctype/student/student_dashboard.py rename to erpnext/education/doctype/student/student_dashboard.py diff --git a/erpnext/schools/doctype/student/student_list.js b/erpnext/education/doctype/student/student_list.js similarity index 100% rename from erpnext/schools/doctype/student/student_list.js rename to erpnext/education/doctype/student/student_list.js diff --git a/erpnext/schools/doctype/student/test_records.json b/erpnext/education/doctype/student/test_records.json similarity index 100% rename from erpnext/schools/doctype/student/test_records.json rename to erpnext/education/doctype/student/test_records.json diff --git a/erpnext/education/doctype/student/test_student.js b/erpnext/education/doctype/student/test_student.js new file mode 100644 index 00000000000..e18d39aee07 --- /dev/null +++ b/erpnext/education/doctype/student/test_student.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Student", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Student + () => frappe.tests.make('Student', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/schools/doctype/student/test_student.py b/erpnext/education/doctype/student/test_student.py similarity index 100% rename from erpnext/schools/doctype/student/test_student.py rename to erpnext/education/doctype/student/test_student.py diff --git a/erpnext/schools/doctype/student_admission/__init__.py b/erpnext/education/doctype/student_admission/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_admission/__init__.py rename to erpnext/education/doctype/student_admission/__init__.py diff --git a/erpnext/schools/doctype/student_admission/student_admission.js b/erpnext/education/doctype/student_admission/student_admission.js similarity index 100% rename from erpnext/schools/doctype/student_admission/student_admission.js rename to erpnext/education/doctype/student_admission/student_admission.js diff --git a/erpnext/schools/doctype/student_admission/student_admission.json b/erpnext/education/doctype/student_admission/student_admission.json similarity index 99% rename from erpnext/schools/doctype/student_admission/student_admission.json rename to erpnext/education/doctype/student_admission/student_admission.json index c35d5be3932..b3c10d43316 100644 --- a/erpnext/schools/doctype/student_admission/student_admission.json +++ b/erpnext/education/doctype/student_admission/student_admission.json @@ -356,9 +356,9 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-10-02 15:16:44.386000", + "modified": "2017-11-10 18:57:34.570376", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Admission", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/student_admission/student_admission.py b/erpnext/education/doctype/student_admission/student_admission.py similarity index 93% rename from erpnext/schools/doctype/student_admission/student_admission.py rename to erpnext/education/doctype/student_admission/student_admission.py index e166b9b5e80..2781c9c50cd 100644 --- a/erpnext/schools/doctype/student_admission/student_admission.py +++ b/erpnext/education/doctype/student_admission/student_admission.py @@ -34,7 +34,7 @@ def get_list_context(context=None): "show_sidebar": True, "title": _("Student Admissions"), "get_list": get_admission_list, - "row_template": "schools/doctype/student_admission/templates/student_admission_row.html", + "row_template": "education/doctype/student_admission/templates/student_admission_row.html", }) def get_admission_list(doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"): diff --git a/erpnext/schools/doctype/student_admission/templates/student_admission.html b/erpnext/education/doctype/student_admission/templates/student_admission.html similarity index 100% rename from erpnext/schools/doctype/student_admission/templates/student_admission.html rename to erpnext/education/doctype/student_admission/templates/student_admission.html diff --git a/erpnext/schools/doctype/student_admission/templates/student_admission_row.html b/erpnext/education/doctype/student_admission/templates/student_admission_row.html similarity index 100% rename from erpnext/schools/doctype/student_admission/templates/student_admission_row.html rename to erpnext/education/doctype/student_admission/templates/student_admission_row.html diff --git a/erpnext/schools/doctype/student_admission/test_student_admission.js b/erpnext/education/doctype/student_admission/test_student_admission.js similarity index 95% rename from erpnext/schools/doctype/student_admission/test_student_admission.js rename to erpnext/education/doctype/student_admission/test_student_admission.js index 767f237f959..ed794b2482e 100644 --- a/erpnext/schools/doctype/student_admission/test_student_admission.js +++ b/erpnext/education/doctype/student_admission/test_student_admission.js @@ -1,5 +1,5 @@ -// Testing Admission Module in Schools -QUnit.module('schools'); +// Testing Admission Module in Education +QUnit.module('education'); QUnit.test('Test: Student Admission', function(assert) { assert.expect(10); diff --git a/erpnext/schools/doctype/student_admission/test_student_admission.py b/erpnext/education/doctype/student_admission/test_student_admission.py similarity index 100% rename from erpnext/schools/doctype/student_admission/test_student_admission.py rename to erpnext/education/doctype/student_admission/test_student_admission.py diff --git a/erpnext/schools/doctype/student_admission_program/__init__.py b/erpnext/education/doctype/student_admission_program/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_admission_program/__init__.py rename to erpnext/education/doctype/student_admission_program/__init__.py diff --git a/erpnext/schools/doctype/student_admission_program/student_admission_program.json b/erpnext/education/doctype/student_admission_program/student_admission_program.json similarity index 98% rename from erpnext/schools/doctype/student_admission_program/student_admission_program.json rename to erpnext/education/doctype/student_admission_program/student_admission_program.json index 29bb57fbd5f..46c5fabdb79 100644 --- a/erpnext/schools/doctype/student_admission_program/student_admission_program.json +++ b/erpnext/education/doctype/student_admission_program/student_admission_program.json @@ -204,9 +204,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-10-02 17:13:52.586218", + "modified": "2017-11-10 18:57:21.174604", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Admission Program", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/student_admission_program/student_admission_program.py b/erpnext/education/doctype/student_admission_program/student_admission_program.py similarity index 100% rename from erpnext/schools/doctype/student_admission_program/student_admission_program.py rename to erpnext/education/doctype/student_admission_program/student_admission_program.py diff --git a/erpnext/schools/doctype/student_applicant/__init__.py b/erpnext/education/doctype/student_applicant/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_applicant/__init__.py rename to erpnext/education/doctype/student_applicant/__init__.py diff --git a/erpnext/schools/doctype/student_applicant/student_applicant.js b/erpnext/education/doctype/student_applicant/student_applicant.js similarity index 96% rename from erpnext/schools/doctype/student_applicant/student_applicant.js rename to erpnext/education/doctype/student_applicant/student_applicant.js index fdf16bae0ac..83621c5725f 100644 --- a/erpnext/schools/doctype/student_applicant/student_applicant.js +++ b/erpnext/education/doctype/student_applicant/student_applicant.js @@ -40,7 +40,7 @@ frappe.ui.form.on("Student Applicant", { enroll: function(frm) { frappe.model.open_mapped_doc({ - method: "erpnext.schools.api.enroll_student", + method: "erpnext.education.api.enroll_student", frm: frm }) } diff --git a/erpnext/schools/doctype/student_applicant/student_applicant.json b/erpnext/education/doctype/student_applicant/student_applicant.json similarity index 99% rename from erpnext/schools/doctype/student_applicant/student_applicant.json rename to erpnext/education/doctype/student_applicant/student_applicant.json index 578f84ceff5..9c8423494b3 100644 --- a/erpnext/schools/doctype/student_applicant/student_applicant.json +++ b/erpnext/education/doctype/student_applicant/student_applicant.json @@ -1058,9 +1058,9 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-08-23 06:12:36.996978", + "modified": "2017-11-10 19:08:55.049625", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Applicant", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/student_applicant/student_applicant.py b/erpnext/education/doctype/student_applicant/student_applicant.py similarity index 100% rename from erpnext/schools/doctype/student_applicant/student_applicant.py rename to erpnext/education/doctype/student_applicant/student_applicant.py diff --git a/erpnext/schools/doctype/student_applicant/student_applicant_list.js b/erpnext/education/doctype/student_applicant/student_applicant_list.js similarity index 100% rename from erpnext/schools/doctype/student_applicant/student_applicant_list.js rename to erpnext/education/doctype/student_applicant/student_applicant_list.js diff --git a/erpnext/schools/doctype/student_applicant/test_student_applicant.py b/erpnext/education/doctype/student_applicant/test_student_applicant.py similarity index 100% rename from erpnext/schools/doctype/student_applicant/test_student_applicant.py rename to erpnext/education/doctype/student_applicant/test_student_applicant.py diff --git a/erpnext/schools/doctype/student_applicant/tests/test_student_applicant.js b/erpnext/education/doctype/student_applicant/tests/test_student_applicant.js similarity index 98% rename from erpnext/schools/doctype/student_applicant/tests/test_student_applicant.js rename to erpnext/education/doctype/student_applicant/tests/test_student_applicant.js index a45b45a6b9d..a69ad8a5646 100644 --- a/erpnext/schools/doctype/student_applicant/tests/test_student_applicant.js +++ b/erpnext/education/doctype/student_applicant/tests/test_student_applicant.js @@ -1,5 +1,5 @@ -// Testing Admission module in Schools -QUnit.module('schools'); +// Testing Admission module in Education +QUnit.module('education'); QUnit.test('Test: Student Applicant', function(assert){ assert.expect(24); diff --git a/erpnext/schools/doctype/student_applicant/tests/test_student_applicant_dummy_data.js b/erpnext/education/doctype/student_applicant/tests/test_student_applicant_dummy_data.js similarity index 100% rename from erpnext/schools/doctype/student_applicant/tests/test_student_applicant_dummy_data.js rename to erpnext/education/doctype/student_applicant/tests/test_student_applicant_dummy_data.js diff --git a/erpnext/schools/doctype/student_applicant/tests/test_student_applicant_options.js b/erpnext/education/doctype/student_applicant/tests/test_student_applicant_options.js similarity index 98% rename from erpnext/schools/doctype/student_applicant/tests/test_student_applicant_options.js rename to erpnext/education/doctype/student_applicant/tests/test_student_applicant_options.js index d8877e63e34..114358f32a1 100644 --- a/erpnext/schools/doctype/student_applicant/tests/test_student_applicant_options.js +++ b/erpnext/education/doctype/student_applicant/tests/test_student_applicant_options.js @@ -1,5 +1,5 @@ -// Testing Admission module in Schools -QUnit.module('schools'); +// Testing Admission module in Education +QUnit.module('education'); QUnit.test('test student applicant', function(assert){ assert.expect(11); diff --git a/erpnext/schools/doctype/student_attendance/__init__.py b/erpnext/education/doctype/student_attendance/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_attendance/__init__.py rename to erpnext/education/doctype/student_attendance/__init__.py diff --git a/erpnext/schools/doctype/student_attendance/student_attendance.js b/erpnext/education/doctype/student_attendance/student_attendance.js similarity index 100% rename from erpnext/schools/doctype/student_attendance/student_attendance.js rename to erpnext/education/doctype/student_attendance/student_attendance.js diff --git a/erpnext/schools/doctype/student_attendance/student_attendance.json b/erpnext/education/doctype/student_attendance/student_attendance.json similarity index 98% rename from erpnext/schools/doctype/student_attendance/student_attendance.json rename to erpnext/education/doctype/student_attendance/student_attendance.json index aa084cc15b4..07530b40a06 100644 --- a/erpnext/schools/doctype/student_attendance/student_attendance.json +++ b/erpnext/education/doctype/student_attendance/student_attendance.json @@ -239,9 +239,9 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-06-30 08:21:51.223266", + "modified": "2017-11-10 19:09:51.041960", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Attendance", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/student_attendance/student_attendance.py b/erpnext/education/doctype/student_attendance/student_attendance.py similarity index 97% rename from erpnext/schools/doctype/student_attendance/student_attendance.py rename to erpnext/education/doctype/student_attendance/student_attendance.py index 696029680fd..06ac4fbc20b 100644 --- a/erpnext/schools/doctype/student_attendance/student_attendance.py +++ b/erpnext/education/doctype/student_attendance/student_attendance.py @@ -7,7 +7,7 @@ import frappe from frappe.model.document import Document from frappe import _ from frappe.utils import cstr -from erpnext.schools.api import get_student_group_students +from erpnext.education.api import get_student_group_students class StudentAttendance(Document): diff --git a/erpnext/schools/doctype/student_attendance/student_attendance_list.js b/erpnext/education/doctype/student_attendance/student_attendance_list.js similarity index 100% rename from erpnext/schools/doctype/student_attendance/student_attendance_list.js rename to erpnext/education/doctype/student_attendance/student_attendance_list.js diff --git a/erpnext/schools/doctype/student_attendance/test_student_attendance.js b/erpnext/education/doctype/student_attendance/test_student_attendance.js similarity index 92% rename from erpnext/schools/doctype/student_attendance/test_student_attendance.js rename to erpnext/education/doctype/student_attendance/test_student_attendance.js index af83e77f3af..c7da6f6b246 100644 --- a/erpnext/schools/doctype/student_attendance/test_student_attendance.js +++ b/erpnext/education/doctype/student_attendance/test_student_attendance.js @@ -1,5 +1,5 @@ -// Testing Attendance Module in Schools -QUnit.module('schools'); +// Testing Attendance Module in Education +QUnit.module('education'); QUnit.test('Test: Student Attendance', function(assert){ assert.expect(2); diff --git a/erpnext/schools/doctype/student_attendance/test_student_attendance.py b/erpnext/education/doctype/student_attendance/test_student_attendance.py similarity index 100% rename from erpnext/schools/doctype/student_attendance/test_student_attendance.py rename to erpnext/education/doctype/student_attendance/test_student_attendance.py diff --git a/erpnext/schools/doctype/student_attendance_tool/__init__.py b/erpnext/education/doctype/student_attendance_tool/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_attendance_tool/__init__.py rename to erpnext/education/doctype/student_attendance_tool/__init__.py diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js b/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js similarity index 93% rename from erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js rename to erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js index 23ec40801f8..df6d13250a8 100644 --- a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +++ b/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js @@ -1,6 +1,6 @@ // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors // For license information, please see license.txt -frappe.provide("schools") +frappe.provide("education"); frappe.ui.form.on('Student Attendance Tool', { onload: function(frm) { @@ -33,7 +33,7 @@ frappe.ui.form.on('Student Attendance Tool', { student_group: function(frm) { if ((frm.doc.student_group && frm.doc.date) || frm.doc.course_schedule) { - var method = "erpnext.schools.doctype.student_attendance_tool.student_attendance_tool.get_student_attendance_records"; + var method = "erpnext.education.doctype.student_attendance_tool.student_attendance_tool.get_student_attendance_records"; frappe.call({ method: method, @@ -64,12 +64,12 @@ frappe.ui.form.on('Student Attendance Tool', { .appendTo(frm.fields_dict.students_html.wrapper); } students = students || []; - frm.students_editor = new schools.StudentsEditor(frm, frm.students_area, students) + frm.students_editor = new education.StudentsEditor(frm, frm.students_area, students); } }); -schools.StudentsEditor = Class.extend({ +education.StudentsEditor = Class.extend({ init: function(frm, wrapper, students) { this.wrapper = wrapper; this.frm = frm; @@ -137,7 +137,7 @@ schools.StudentsEditor = Class.extend({ function() { //ifyes if(!frappe.request.ajax_count) { frappe.call({ - method: "erpnext.schools.api.mark_attendance", + method: "erpnext.education.api.mark_attendance", freeze: true, freeze_message: "Marking attendance", args: { diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.json b/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.json similarity index 99% rename from erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.json rename to erpnext/education/doctype/student_attendance_tool/student_attendance_tool.json index 5c28655fa75..26b28b3ebee 100644 --- a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.json +++ b/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.json @@ -273,9 +273,9 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2017-11-08 11:53:27.994112", + "modified": "2017-11-10 18:55:36.168044", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Attendance Tool", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.py b/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.py similarity index 100% rename from erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.py rename to erpnext/education/doctype/student_attendance_tool/student_attendance_tool.py diff --git a/erpnext/schools/doctype/student_attendance_tool/test_student_attendance_tool.js b/erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.js similarity index 97% rename from erpnext/schools/doctype/student_attendance_tool/test_student_attendance_tool.js rename to erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.js index 3044f20163d..19b32a99ec6 100644 --- a/erpnext/schools/doctype/student_attendance_tool/test_student_attendance_tool.js +++ b/erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.js @@ -1,5 +1,5 @@ -// Testing Attendance Module in Schools -QUnit.module('schools'); +// Testing Attendance Module in Education +QUnit.module('education'); QUnit.test('Test: Student Attendace Tool', function(assert){ assert.expect(10); diff --git a/erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.py b/erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.py new file mode 100644 index 00000000000..ffc42af4749 --- /dev/null +++ b/erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestStudentAttendanceTool(unittest.TestCase): + pass diff --git a/erpnext/schools/doctype/student_batch_name/__init__.py b/erpnext/education/doctype/student_batch_name/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_batch_name/__init__.py rename to erpnext/education/doctype/student_batch_name/__init__.py diff --git a/erpnext/schools/doctype/student_batch_name/student_batch_name.js b/erpnext/education/doctype/student_batch_name/student_batch_name.js similarity index 100% rename from erpnext/schools/doctype/student_batch_name/student_batch_name.js rename to erpnext/education/doctype/student_batch_name/student_batch_name.js diff --git a/erpnext/schools/doctype/student_batch_name/student_batch_name.json b/erpnext/education/doctype/student_batch_name/student_batch_name.json similarity index 96% rename from erpnext/schools/doctype/student_batch_name/student_batch_name.json rename to erpnext/education/doctype/student_batch_name/student_batch_name.json index 6b0848701c4..abb64360101 100644 --- a/erpnext/schools/doctype/student_batch_name/student_batch_name.json +++ b/erpnext/education/doctype/student_batch_name/student_batch_name.json @@ -54,9 +54,9 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-06-30 08:21:51.545155", + "modified": "2017-11-10 19:08:17.980349", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Batch Name", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/student_batch_name/student_batch_name.py b/erpnext/education/doctype/student_batch_name/student_batch_name.py similarity index 100% rename from erpnext/schools/doctype/student_batch_name/student_batch_name.py rename to erpnext/education/doctype/student_batch_name/student_batch_name.py diff --git a/erpnext/schools/doctype/student_batch_name/test_records.json b/erpnext/education/doctype/student_batch_name/test_records.json similarity index 100% rename from erpnext/schools/doctype/student_batch_name/test_records.json rename to erpnext/education/doctype/student_batch_name/test_records.json diff --git a/erpnext/schools/doctype/student_batch_name/test_student_batch_name.js b/erpnext/education/doctype/student_batch_name/test_student_batch_name.js similarity index 83% rename from erpnext/schools/doctype/student_batch_name/test_student_batch_name.js rename to erpnext/education/doctype/student_batch_name/test_student_batch_name.js index 6a10dc1e35e..6c761b8418b 100644 --- a/erpnext/schools/doctype/student_batch_name/test_student_batch_name.js +++ b/erpnext/education/doctype/student_batch_name/test_student_batch_name.js @@ -1,5 +1,5 @@ -// Testing Setup Module in Schools -QUnit.module('schools'); +// Testing Setup Module in Education +QUnit.module('education'); QUnit.test('Test: Student Batch Name', function(assert){ assert.expect(1); diff --git a/erpnext/schools/doctype/student_batch_name/test_student_batch_name.py b/erpnext/education/doctype/student_batch_name/test_student_batch_name.py similarity index 100% rename from erpnext/schools/doctype/student_batch_name/test_student_batch_name.py rename to erpnext/education/doctype/student_batch_name/test_student_batch_name.py diff --git a/erpnext/schools/doctype/student_category/__init__.py b/erpnext/education/doctype/student_category/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_category/__init__.py rename to erpnext/education/doctype/student_category/__init__.py diff --git a/erpnext/schools/doctype/student_category/student_category.js b/erpnext/education/doctype/student_category/student_category.js similarity index 100% rename from erpnext/schools/doctype/student_category/student_category.js rename to erpnext/education/doctype/student_category/student_category.js diff --git a/erpnext/schools/doctype/student_category/student_category.json b/erpnext/education/doctype/student_category/student_category.json similarity index 96% rename from erpnext/schools/doctype/student_category/student_category.json rename to erpnext/education/doctype/student_category/student_category.json index ce4cb4e58da..d7d4444a281 100644 --- a/erpnext/schools/doctype/student_category/student_category.json +++ b/erpnext/education/doctype/student_category/student_category.json @@ -53,9 +53,9 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-06-30 08:21:51.652539", + "modified": "2017-11-10 19:09:45.783401", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Category", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/student_category/student_category.py b/erpnext/education/doctype/student_category/student_category.py similarity index 100% rename from erpnext/schools/doctype/student_category/student_category.py rename to erpnext/education/doctype/student_category/student_category.py diff --git a/erpnext/schools/doctype/student_category/test_student_category.js b/erpnext/education/doctype/student_category/test_student_category.js similarity index 84% rename from erpnext/schools/doctype/student_category/test_student_category.js rename to erpnext/education/doctype/student_category/test_student_category.js index 5e3109a6bb3..01f50e279dc 100644 --- a/erpnext/schools/doctype/student_category/test_student_category.js +++ b/erpnext/education/doctype/student_category/test_student_category.js @@ -1,5 +1,5 @@ -// Testing Setup Module in Schools -QUnit.module('schools'); +// Testing Setup Module in Education +QUnit.module('education'); QUnit.test('Test: Student Category', function(assert){ assert.expect(1); diff --git a/erpnext/schools/doctype/student_category/test_student_category.py b/erpnext/education/doctype/student_category/test_student_category.py similarity index 100% rename from erpnext/schools/doctype/student_category/test_student_category.py rename to erpnext/education/doctype/student_category/test_student_category.py diff --git a/erpnext/schools/doctype/student_group/__init__.py b/erpnext/education/doctype/student_group/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_group/__init__.py rename to erpnext/education/doctype/student_group/__init__.py diff --git a/erpnext/schools/doctype/student_group/student_group.js b/erpnext/education/doctype/student_group/student_group.js similarity index 93% rename from erpnext/schools/doctype/student_group/student_group.js rename to erpnext/education/doctype/student_group/student_group.js index 80355a8b947..f3f8c886247 100644 --- a/erpnext/schools/doctype/student_group/student_group.js +++ b/erpnext/education/doctype/student_group/student_group.js @@ -12,7 +12,7 @@ frappe.ui.form.on("Student Group", { if (!frm.__islocal) { frm.set_query("student", "students", function() { return{ - query: "erpnext.schools.doctype.student_group.student_group.fetch_students", + query: "erpnext.education.doctype.student_group.student_group.fetch_students", filters: { 'academic_year': frm.doc.academic_year, 'group_based_on': frm.doc.group_based_on, @@ -50,7 +50,7 @@ frappe.ui.form.on("Student Group", { }); frm.add_custom_button(__("Update Email Group"), function() { frappe.call({ - method: "erpnext.schools.api.update_email_group", + method: "erpnext.education.api.update_email_group", args: { "doctype": "Student Group", "name": frm.doc.name @@ -83,7 +83,7 @@ frappe.ui.form.on("Student Group", { } }); frappe.call({ - method: "erpnext.schools.doctype.student_group.student_group.get_students", + method: "erpnext.education.doctype.student_group.student_group.get_students", args: { "academic_year": frm.doc.academic_year, "academic_term": frm.doc.academic_term, diff --git a/erpnext/schools/doctype/student_group/student_group.json b/erpnext/education/doctype/student_group/student_group.json similarity index 99% rename from erpnext/schools/doctype/student_group/student_group.json rename to erpnext/education/doctype/student_group/student_group.json index 0a9b41a8554..37a611b33da 100644 --- a/erpnext/schools/doctype/student_group/student_group.json +++ b/erpnext/education/doctype/student_group/student_group.json @@ -459,9 +459,9 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-06-30 08:21:51.755519", + "modified": "2017-11-10 19:09:37.370864", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Group", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/student_group/student_group.py b/erpnext/education/doctype/student_group/student_group.py similarity index 98% rename from erpnext/schools/doctype/student_group/student_group.py rename to erpnext/education/doctype/student_group/student_group.py index 950632ba508..d5085894090 100644 --- a/erpnext/schools/doctype/student_group/student_group.py +++ b/erpnext/education/doctype/student_group/student_group.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document from frappe import _ -from erpnext.schools.utils import validate_duplicate_student +from erpnext.education.utils import validate_duplicate_student from frappe.utils import cint class StudentGroup(Document): diff --git a/erpnext/schools/doctype/student_group/test_records.json b/erpnext/education/doctype/student_group/test_records.json similarity index 100% rename from erpnext/schools/doctype/student_group/test_records.json rename to erpnext/education/doctype/student_group/test_records.json diff --git a/erpnext/schools/doctype/student_group/test_student_group.js b/erpnext/education/doctype/student_group/test_student_group.js similarity index 95% rename from erpnext/schools/doctype/student_group/test_student_group.js rename to erpnext/education/doctype/student_group/test_student_group.js index bee5067d9b8..6673343be7e 100644 --- a/erpnext/schools/doctype/student_group/test_student_group.js +++ b/erpnext/education/doctype/student_group/test_student_group.js @@ -1,5 +1,5 @@ -// Testing Student Module in Schools -QUnit.module('schools'); +// Testing Student Module in Education +QUnit.module('education'); QUnit.test('Test: Student Group', function(assert){ assert.expect(2); diff --git a/erpnext/schools/doctype/student_group/test_student_group.py b/erpnext/education/doctype/student_group/test_student_group.py similarity index 100% rename from erpnext/schools/doctype/student_group/test_student_group.py rename to erpnext/education/doctype/student_group/test_student_group.py diff --git a/erpnext/schools/doctype/student_group_creation_tool/__init__.py b/erpnext/education/doctype/student_group_creation_tool/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_group_creation_tool/__init__.py rename to erpnext/education/doctype/student_group_creation_tool/__init__.py diff --git a/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js b/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js similarity index 100% rename from erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js rename to erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js diff --git a/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.json b/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.json similarity index 98% rename from erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.json rename to erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.json index a6ed9898682..d759b9178e2 100644 --- a/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.json +++ b/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.json @@ -269,9 +269,9 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2017-07-17 21:57:35.602091", + "modified": "2017-11-10 19:40:07.862203", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Group Creation Tool", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py b/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py similarity index 95% rename from erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py rename to erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py index 649e5daedf3..643093ee485 100644 --- a/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +++ b/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe from frappe import _ from frappe.model.document import Document -from erpnext.schools.doctype.student_group.student_group import get_students +from erpnext.education.doctype.student_group.student_group import get_students class StudentGroupCreationTool(Document): def get_courses(self): diff --git a/erpnext/schools/doctype/student_group_creation_tool/test_student_group_creation_tool.js b/erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.js similarity index 98% rename from erpnext/schools/doctype/student_group_creation_tool/test_student_group_creation_tool.js rename to erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.js index a8567b3ba01..34c10930b57 100644 --- a/erpnext/schools/doctype/student_group_creation_tool/test_student_group_creation_tool.js +++ b/erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.js @@ -1,4 +1,4 @@ -QUnit.module('schools'); +QUnit.module('education'); QUnit.test('Test: Student Group Creation Tool', function(assert){ assert.expect(5); diff --git a/erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.py b/erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.py new file mode 100644 index 00000000000..9ca56588f2c --- /dev/null +++ b/erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest + +class TestStudentGroupCreationTool(unittest.TestCase): + pass diff --git a/erpnext/schools/doctype/student_group_creation_tool_course/__init__.py b/erpnext/education/doctype/student_group_creation_tool_course/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_group_creation_tool_course/__init__.py rename to erpnext/education/doctype/student_group_creation_tool_course/__init__.py diff --git a/erpnext/schools/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json b/erpnext/education/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json similarity index 98% rename from erpnext/schools/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json rename to erpnext/education/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json index d945d4b7e59..a749929ffd9 100644 --- a/erpnext/schools/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json +++ b/erpnext/education/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json @@ -236,9 +236,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-05-15 14:18:23.435415", + "modified": "2017-11-10 19:08:27.657591", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Group Creation Tool Course", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/student_group_creation_tool_course/student_group_creation_tool_course.py b/erpnext/education/doctype/student_group_creation_tool_course/student_group_creation_tool_course.py similarity index 100% rename from erpnext/schools/doctype/student_group_creation_tool_course/student_group_creation_tool_course.py rename to erpnext/education/doctype/student_group_creation_tool_course/student_group_creation_tool_course.py diff --git a/erpnext/schools/doctype/student_group_instructor/__init__.py b/erpnext/education/doctype/student_group_instructor/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_group_instructor/__init__.py rename to erpnext/education/doctype/student_group_instructor/__init__.py diff --git a/erpnext/schools/doctype/student_group_instructor/student_group_instructor.json b/erpnext/education/doctype/student_group_instructor/student_group_instructor.json similarity index 94% rename from erpnext/schools/doctype/student_group_instructor/student_group_instructor.json rename to erpnext/education/doctype/student_group_instructor/student_group_instructor.json index 541e9b336b0..c09d7d3a1c0 100644 --- a/erpnext/schools/doctype/student_group_instructor/student_group_instructor.json +++ b/erpnext/education/doctype/student_group_instructor/student_group_instructor.json @@ -13,6 +13,7 @@ "engine": "InnoDB", "fields": [ { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -43,6 +44,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -71,6 +73,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -111,9 +114,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-04-17 16:06:05.792863", + "modified": "2017-11-10 19:11:31.439735", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Group Instructor", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/student_group_instructor/student_group_instructor.py b/erpnext/education/doctype/student_group_instructor/student_group_instructor.py similarity index 100% rename from erpnext/schools/doctype/student_group_instructor/student_group_instructor.py rename to erpnext/education/doctype/student_group_instructor/student_group_instructor.py diff --git a/erpnext/schools/doctype/student_group_student/__init__.py b/erpnext/education/doctype/student_group_student/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_group_student/__init__.py rename to erpnext/education/doctype/student_group_student/__init__.py diff --git a/erpnext/schools/doctype/student_group_student/student_group_student.json b/erpnext/education/doctype/student_group_student/student_group_student.json similarity index 95% rename from erpnext/schools/doctype/student_group_student/student_group_student.json rename to erpnext/education/doctype/student_group_student/student_group_student.json index 5fc434adf44..3ff339ffb22 100644 --- a/erpnext/schools/doctype/student_group_student/student_group_student.json +++ b/erpnext/education/doctype/student_group_student/student_group_student.json @@ -12,6 +12,7 @@ "editable_grid": 1, "fields": [ { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -42,6 +43,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -71,6 +73,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -99,6 +102,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -128,6 +132,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -168,9 +173,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-04-12 14:56:07.532226", + "modified": "2017-11-10 19:11:39.735521", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Group Student", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/student_group_student/student_group_student.py b/erpnext/education/doctype/student_group_student/student_group_student.py similarity index 100% rename from erpnext/schools/doctype/student_group_student/student_group_student.py rename to erpnext/education/doctype/student_group_student/student_group_student.py diff --git a/erpnext/schools/doctype/student_guardian/__init__.py b/erpnext/education/doctype/student_guardian/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_guardian/__init__.py rename to erpnext/education/doctype/student_guardian/__init__.py diff --git a/erpnext/schools/doctype/student_guardian/student_guardian.json b/erpnext/education/doctype/student_guardian/student_guardian.json similarity index 93% rename from erpnext/schools/doctype/student_guardian/student_guardian.json rename to erpnext/education/doctype/student_guardian/student_guardian.json index b5f9d884d08..b4844fd6fb9 100644 --- a/erpnext/schools/doctype/student_guardian/student_guardian.json +++ b/erpnext/education/doctype/student_guardian/student_guardian.json @@ -1,5 +1,6 @@ { "allow_copy": 0, + "allow_guest_to_view": 0, "allow_import": 0, "allow_rename": 0, "beta": 0, @@ -11,6 +12,7 @@ "editable_grid": 1, "fields": [ { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -41,6 +43,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -70,6 +73,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -100,19 +104,19 @@ "unique": 0 } ], + "has_web_view": 0, "hide_heading": 0, "hide_toolbar": 0, "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, "is_submittable": 0, "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-02-17 17:13:53.507571", + "modified": "2017-11-10 19:10:57.680471", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Guardian", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/student_guardian/student_guardian.py b/erpnext/education/doctype/student_guardian/student_guardian.py similarity index 100% rename from erpnext/schools/doctype/student_guardian/student_guardian.py rename to erpnext/education/doctype/student_guardian/student_guardian.py diff --git a/erpnext/schools/doctype/student_language/__init__.py b/erpnext/education/doctype/student_language/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_language/__init__.py rename to erpnext/education/doctype/student_language/__init__.py diff --git a/erpnext/schools/doctype/student_language/student_language.js b/erpnext/education/doctype/student_language/student_language.js similarity index 100% rename from erpnext/schools/doctype/student_language/student_language.js rename to erpnext/education/doctype/student_language/student_language.js diff --git a/erpnext/schools/doctype/student_language/student_language.json b/erpnext/education/doctype/student_language/student_language.json similarity index 91% rename from erpnext/schools/doctype/student_language/student_language.json rename to erpnext/education/doctype/student_language/student_language.json index f3b4eb13478..43e6dbdbcb1 100644 --- a/erpnext/schools/doctype/student_language/student_language.json +++ b/erpnext/education/doctype/student_language/student_language.json @@ -1,5 +1,6 @@ { "allow_copy": 0, + "allow_guest_to_view": 0, "allow_import": 0, "allow_rename": 0, "autoname": "field:language_name", @@ -13,6 +14,7 @@ "engine": "InnoDB", "fields": [ { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -24,7 +26,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_global_search": 0, - "in_list_view": 0, + "in_list_view": 1, "in_standard_filter": 0, "label": "Language Name", "length": 0, @@ -42,19 +44,19 @@ "unique": 0 } ], + "has_web_view": 0, "hide_heading": 0, "hide_toolbar": 0, "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, "is_submittable": 0, "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-02-22 13:03:48.600707", + "modified": "2017-11-10 19:05:37.035846", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Language", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/student_language/student_language.py b/erpnext/education/doctype/student_language/student_language.py similarity index 100% rename from erpnext/schools/doctype/student_language/student_language.py rename to erpnext/education/doctype/student_language/student_language.py diff --git a/erpnext/education/doctype/student_language/test_student_language.js b/erpnext/education/doctype/student_language/test_student_language.js new file mode 100644 index 00000000000..9b25569961a --- /dev/null +++ b/erpnext/education/doctype/student_language/test_student_language.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Student Language", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Student Language + () => frappe.tests.make('Student Language', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/schools/doctype/student_language/test_student_language.py b/erpnext/education/doctype/student_language/test_student_language.py similarity index 100% rename from erpnext/schools/doctype/student_language/test_student_language.py rename to erpnext/education/doctype/student_language/test_student_language.py diff --git a/erpnext/schools/doctype/student_leave_application/__init__.py b/erpnext/education/doctype/student_leave_application/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_leave_application/__init__.py rename to erpnext/education/doctype/student_leave_application/__init__.py diff --git a/erpnext/schools/doctype/student_leave_application/student_leave_application.js b/erpnext/education/doctype/student_leave_application/student_leave_application.js similarity index 100% rename from erpnext/schools/doctype/student_leave_application/student_leave_application.js rename to erpnext/education/doctype/student_leave_application/student_leave_application.js diff --git a/erpnext/education/doctype/student_leave_application/student_leave_application.json b/erpnext/education/doctype/student_leave_application/student_leave_application.json new file mode 100644 index 00000000000..93ff1ad58b9 --- /dev/null +++ b/erpnext/education/doctype/student_leave_application/student_leave_application.json @@ -0,0 +1,357 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "SLA.######", + "beta": 0, + "creation": "2016-11-28 15:38:54.793854", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "student", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 1, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Student", + "length": 0, + "no_copy": 0, + "options": "Student", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "student_name", + "fieldtype": "Read Only", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 1, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Student Name", + "length": 0, + "no_copy": 0, + "options": "student.title", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_3", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "from_date", + "fieldtype": "Date", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 1, + "label": "From Date", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "to_date", + "fieldtype": "Date", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "To Date", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "description": "Will show the student as Present in Student Monthly Attendance Report", + "fieldname": "mark_as_present", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Mark as Present", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_5", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "reason", + "fieldtype": "Text", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Reason", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "amended_from", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Amended From", + "length": 0, + "no_copy": 1, + "options": "Student Leave Application", + "permlevel": 0, + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 1, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2017-11-10 19:09:31.848381", + "modified_by": "Administrator", + "module": "Education", + "name": "Student Leave Application", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 1, + "apply_user_permissions": 0, + "cancel": 1, + "create": 1, + "delete": 1, + "email": 1, + "export": 0, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Instructor", + "set_user_permissions": 0, + "share": 0, + "submit": 1, + "write": 1 + }, + { + "amend": 1, + "apply_user_permissions": 0, + "cancel": 1, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Academics User", + "set_user_permissions": 0, + "share": 1, + "submit": 1, + "write": 1 + } + ], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "restrict_to_domain": "Education", + "show_name_in_global_search": 1, + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "student_name", + "track_changes": 0, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/schools/doctype/student_leave_application/student_leave_application.py b/erpnext/education/doctype/student_leave_application/student_leave_application.py similarity index 100% rename from erpnext/schools/doctype/student_leave_application/student_leave_application.py rename to erpnext/education/doctype/student_leave_application/student_leave_application.py diff --git a/erpnext/schools/doctype/student_leave_application/test_student_leave_application.js b/erpnext/education/doctype/student_leave_application/test_student_leave_application.js similarity index 96% rename from erpnext/schools/doctype/student_leave_application/test_student_leave_application.js rename to erpnext/education/doctype/student_leave_application/test_student_leave_application.js index d7a69736691..5af9f5d50f7 100644 --- a/erpnext/schools/doctype/student_leave_application/test_student_leave_application.js +++ b/erpnext/education/doctype/student_leave_application/test_student_leave_application.js @@ -1,5 +1,5 @@ -// Testing Attendance Module in Schools -QUnit.module('schools'); +// Testing Attendance Module in Education +QUnit.module('education'); QUnit.test('Test: Student Leave Application', function(assert){ assert.expect(4); diff --git a/erpnext/schools/doctype/student_leave_application/test_student_leave_application.py b/erpnext/education/doctype/student_leave_application/test_student_leave_application.py similarity index 100% rename from erpnext/schools/doctype/student_leave_application/test_student_leave_application.py rename to erpnext/education/doctype/student_leave_application/test_student_leave_application.py diff --git a/erpnext/schools/doctype/student_log/__init__.py b/erpnext/education/doctype/student_log/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_log/__init__.py rename to erpnext/education/doctype/student_log/__init__.py diff --git a/erpnext/schools/doctype/student_log/student_log.js b/erpnext/education/doctype/student_log/student_log.js similarity index 100% rename from erpnext/schools/doctype/student_log/student_log.js rename to erpnext/education/doctype/student_log/student_log.js diff --git a/erpnext/education/doctype/student_log/student_log.json b/erpnext/education/doctype/student_log/student_log.json new file mode 100644 index 00000000000..9d55bb95732 --- /dev/null +++ b/erpnext/education/doctype/student_log/student_log.json @@ -0,0 +1,400 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "SLog.####", + "beta": 0, + "creation": "2016-07-29 03:27:22.451772", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "student", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 1, + "label": "Student", + "length": 0, + "no_copy": 0, + "options": "Student", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "student_name", + "fieldtype": "Read Only", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 1, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Student Name", + "length": 0, + "no_copy": 0, + "options": "student.title", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "type", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Type", + "length": 0, + "no_copy": 0, + "options": "General\nAcademic\nMedical\nAchievement", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "date", + "fieldtype": "Date", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Date", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_3", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "academic_year", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Academic Year", + "length": 0, + "no_copy": 0, + "options": "Academic Year", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "academic_term", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Academic Term", + "length": 0, + "no_copy": 0, + "options": "Academic Term", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "program", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Program", + "length": 0, + "no_copy": 0, + "options": "Program", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "student_batch", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Student Batch", + "length": 0, + "no_copy": 0, + "options": "Student Batch Name", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_5", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "log", + "fieldtype": "Text Editor", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 1, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Log", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2017-11-10 19:04:50.483773", + "modified_by": "Administrator", + "module": "Education", + "name": "Student Log", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Academics User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "restrict_to_domain": "Education", + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "student_name", + "track_changes": 0, + "track_seen": 1 +} \ No newline at end of file diff --git a/erpnext/schools/doctype/student_log/student_log.py b/erpnext/education/doctype/student_log/student_log.py similarity index 100% rename from erpnext/schools/doctype/student_log/student_log.py rename to erpnext/education/doctype/student_log/student_log.py diff --git a/erpnext/schools/doctype/student_log/test_student_log.js b/erpnext/education/doctype/student_log/test_student_log.js similarity index 94% rename from erpnext/schools/doctype/student_log/test_student_log.js rename to erpnext/education/doctype/student_log/test_student_log.js index 8f8d152f8c7..5775369e52e 100644 --- a/erpnext/schools/doctype/student_log/test_student_log.js +++ b/erpnext/education/doctype/student_log/test_student_log.js @@ -1,5 +1,5 @@ -// Testing Student Module in Schools -QUnit.module('schools'); +// Testing Student Module in Education +QUnit.module('education'); QUnit.test('Test: Student Log', function(assert){ assert.expect(9); diff --git a/erpnext/schools/doctype/student_log/test_student_log.py b/erpnext/education/doctype/student_log/test_student_log.py similarity index 100% rename from erpnext/schools/doctype/student_log/test_student_log.py rename to erpnext/education/doctype/student_log/test_student_log.py diff --git a/erpnext/schools/doctype/student_sibling/__init__.py b/erpnext/education/doctype/student_sibling/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_sibling/__init__.py rename to erpnext/education/doctype/student_sibling/__init__.py diff --git a/erpnext/schools/doctype/student_sibling/student_sibling.json b/erpnext/education/doctype/student_sibling/student_sibling.json similarity index 95% rename from erpnext/schools/doctype/student_sibling/student_sibling.json rename to erpnext/education/doctype/student_sibling/student_sibling.json index fb698d92851..22b71824a98 100644 --- a/erpnext/schools/doctype/student_sibling/student_sibling.json +++ b/erpnext/education/doctype/student_sibling/student_sibling.json @@ -12,6 +12,7 @@ "editable_grid": 0, "fields": [ { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -42,6 +43,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -72,6 +74,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -103,6 +106,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -131,6 +135,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -162,6 +167,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -192,6 +198,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -221,6 +228,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -261,9 +269,9 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-03-08 11:26:41.717041", + "modified": "2017-11-10 19:05:24.999063", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Sibling", "name_case": "", "owner": "Administrator", diff --git a/erpnext/schools/doctype/student_sibling/student_sibling.py b/erpnext/education/doctype/student_sibling/student_sibling.py similarity index 100% rename from erpnext/schools/doctype/student_sibling/student_sibling.py rename to erpnext/education/doctype/student_sibling/student_sibling.py diff --git a/erpnext/schools/doctype/student_siblings/__init__.py b/erpnext/education/doctype/student_siblings/__init__.py similarity index 100% rename from erpnext/schools/doctype/student_siblings/__init__.py rename to erpnext/education/doctype/student_siblings/__init__.py diff --git a/erpnext/schools/doctype/student_siblings/student_siblings.json b/erpnext/education/doctype/student_siblings/student_siblings.json similarity index 81% rename from erpnext/schools/doctype/student_siblings/student_siblings.json rename to erpnext/education/doctype/student_siblings/student_siblings.json index 4f1ed0294cc..0fdc2fd70a2 100644 --- a/erpnext/schools/doctype/student_siblings/student_siblings.json +++ b/erpnext/education/doctype/student_siblings/student_siblings.json @@ -1,5 +1,6 @@ { "allow_copy": 0, + "allow_guest_to_view": 0, "allow_import": 0, "allow_rename": 0, "beta": 0, @@ -11,6 +12,7 @@ "editable_grid": 1, "fields": [ { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -21,7 +23,9 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, + "in_global_search": 0, "in_list_view": 1, + "in_standard_filter": 0, "label": "Name", "length": 0, "no_copy": 0, @@ -31,6 +35,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 1, "search_index": 0, @@ -38,6 +43,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -48,7 +54,9 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, + "in_global_search": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Gender", "length": 0, "no_copy": 0, @@ -58,6 +66,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -65,6 +74,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -75,7 +85,9 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, + "in_global_search": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Date of Birth", "length": 0, "no_copy": 0, @@ -84,6 +96,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -91,19 +104,19 @@ "unique": 0 } ], + "has_web_view": 0, "hide_heading": 0, "hide_toolbar": 0, "idx": 0, "image_view": 0, "in_create": 0, - "in_dialog": 0, "is_submittable": 0, "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-09-01 14:41:23.824083", + "modified": "2017-11-10 19:05:46.408887", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Siblings", "name_case": "", "owner": "Administrator", @@ -111,7 +124,9 @@ "quick_entry": 1, "read_only": 0, "read_only_onload": 0, + "show_name_in_global_search": 0, "sort_field": "modified", "sort_order": "DESC", + "track_changes": 0, "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/schools/doctype/student_siblings/student_siblings.py b/erpnext/education/doctype/student_siblings/student_siblings.py similarity index 100% rename from erpnext/schools/doctype/student_siblings/student_siblings.py rename to erpnext/education/doctype/student_siblings/student_siblings.py diff --git a/erpnext/schools/report/__init__.py b/erpnext/education/report/__init__.py similarity index 100% rename from erpnext/schools/report/__init__.py rename to erpnext/education/report/__init__.py diff --git a/erpnext/schools/report/absent_student_report/__init__.py b/erpnext/education/report/absent_student_report/__init__.py similarity index 100% rename from erpnext/schools/report/absent_student_report/__init__.py rename to erpnext/education/report/absent_student_report/__init__.py diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.js b/erpnext/education/report/absent_student_report/absent_student_report.js similarity index 100% rename from erpnext/schools/report/absent_student_report/absent_student_report.js rename to erpnext/education/report/absent_student_report/absent_student_report.js diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.json b/erpnext/education/report/absent_student_report/absent_student_report.json similarity index 86% rename from erpnext/schools/report/absent_student_report/absent_student_report.json rename to erpnext/education/report/absent_student_report/absent_student_report.json index 3a2e85f83e8..0d5eebabf8c 100644 --- a/erpnext/schools/report/absent_student_report/absent_student_report.json +++ b/erpnext/education/report/absent_student_report/absent_student_report.json @@ -7,9 +7,9 @@ "doctype": "Report", "idx": 3, "is_standard": "Yes", - "modified": "2017-02-24 20:03:01.035036", + "modified": "2017-11-10 19:42:36.457449", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Absent Student Report", "owner": "Administrator", "ref_doctype": "Student Attendance", diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.py b/erpnext/education/report/absent_student_report/absent_student_report.py similarity index 100% rename from erpnext/schools/report/absent_student_report/absent_student_report.py rename to erpnext/education/report/absent_student_report/absent_student_report.py diff --git a/erpnext/schools/report/course_wise_assessment_report/__init__.py b/erpnext/education/report/course_wise_assessment_report/__init__.py similarity index 100% rename from erpnext/schools/report/course_wise_assessment_report/__init__.py rename to erpnext/education/report/course_wise_assessment_report/__init__.py diff --git a/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html similarity index 100% rename from erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html rename to erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html diff --git a/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.js b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.js similarity index 100% rename from erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.js rename to erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.js diff --git a/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.json b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.json similarity index 87% rename from erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.json rename to erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.json index 6b089d276ff..e153f8c55b5 100644 --- a/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.json +++ b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.json @@ -7,9 +7,9 @@ "doctype": "Report", "idx": 0, "is_standard": "Yes", - "modified": "2017-05-05 14:47:18.080385", + "modified": "2017-11-10 19:41:46.641227", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Course wise Assessment Report", "owner": "Administrator", "ref_doctype": "Assessment Result", diff --git a/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py similarity index 99% rename from erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py rename to erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py index 492d7384480..ff172381b3e 100644 --- a/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +++ b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py @@ -6,7 +6,7 @@ import frappe from frappe import _ from frappe.utils import flt from collections import defaultdict -from erpnext.schools.api import get_grade +from erpnext.education.api import get_grade def execute(filters=None): diff --git a/erpnext/schools/report/student_and_guardian_contact_details/__init__.py b/erpnext/education/report/student_and_guardian_contact_details/__init__.py similarity index 100% rename from erpnext/schools/report/student_and_guardian_contact_details/__init__.py rename to erpnext/education/report/student_and_guardian_contact_details/__init__.py diff --git a/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.js b/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.js similarity index 100% rename from erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.js rename to erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.js diff --git a/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.json b/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.json similarity index 88% rename from erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.json rename to erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.json index e8225490bf9..fe7d1586c86 100644 --- a/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.json +++ b/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.json @@ -7,9 +7,9 @@ "doctype": "Report", "idx": 0, "is_standard": "Yes", - "modified": "2017-03-27 18:34:08.867661", + "modified": "2017-11-10 19:42:30.300729", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student and Guardian Contact Details", "owner": "Administrator", "ref_doctype": "Program Enrollment", diff --git a/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py b/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py similarity index 100% rename from erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py rename to erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py diff --git a/erpnext/schools/report/student_batch_wise_attendance/__init__.py b/erpnext/education/report/student_batch_wise_attendance/__init__.py similarity index 100% rename from erpnext/schools/report/student_batch_wise_attendance/__init__.py rename to erpnext/education/report/student_batch_wise_attendance/__init__.py diff --git a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.js b/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.js similarity index 100% rename from erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.js rename to erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.js diff --git a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.json b/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.json similarity index 87% rename from erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.json rename to erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.json index 7851cbb8e63..eb547b71025 100644 --- a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.json +++ b/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.json @@ -7,9 +7,9 @@ "doctype": "Report", "idx": 2, "is_standard": "Yes", - "modified": "2017-02-24 20:02:33.773899", + "modified": "2017-11-10 19:41:12.328346", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Batch-Wise Attendance", "owner": "Administrator", "ref_doctype": "Student Attendance", diff --git a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py b/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py similarity index 100% rename from erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py rename to erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py diff --git a/erpnext/schools/report/student_fee_collection/__init__.py b/erpnext/education/report/student_fee_collection/__init__.py similarity index 100% rename from erpnext/schools/report/student_fee_collection/__init__.py rename to erpnext/education/report/student_fee_collection/__init__.py diff --git a/erpnext/schools/report/student_fee_collection/student_fee_collection.json b/erpnext/education/report/student_fee_collection/student_fee_collection.json similarity index 91% rename from erpnext/schools/report/student_fee_collection/student_fee_collection.json rename to erpnext/education/report/student_fee_collection/student_fee_collection.json index 5c63765cf8f..07fc27c7a08 100644 --- a/erpnext/schools/report/student_fee_collection/student_fee_collection.json +++ b/erpnext/education/report/student_fee_collection/student_fee_collection.json @@ -7,9 +7,9 @@ "doctype": "Report", "idx": 3, "is_standard": "Yes", - "modified": "2017-10-25 11:59:26.003899", + "modified": "2017-11-10 19:41:37.320224", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Fee Collection", "owner": "Administrator", "query": "SELECT\n student as \"Student:Link/Student:200\",\n student_name as \"Student Name::200\",\n sum(paid_amount) as \"Paid Amount:Currency:150\",\n sum(outstanding_amount) as \"Outstanding Amount:Currency:150\",\n sum(grand_total) as \"Grand Total:Currency:150\"\nFROM\n `tabFees` \nGROUP BY\n student", diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/__init__.py b/erpnext/education/report/student_monthly_attendance_sheet/__init__.py similarity index 100% rename from erpnext/schools/report/student_monthly_attendance_sheet/__init__.py rename to erpnext/education/report/student_monthly_attendance_sheet/__init__.py diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js b/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js similarity index 89% rename from erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js rename to erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js index 943238ece26..402bb02e974 100644 --- a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js +++ b/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js @@ -29,7 +29,7 @@ frappe.query_reports["Student Monthly Attendance Sheet"] = { "onload": function() { return frappe.call({ - method: "erpnext.schools.report.student_monthly_attendance_sheet.student_monthly_attendance_sheet.get_attendance_years", + method: "erpnext.education.report.student_monthly_attendance_sheet.student_monthly_attendance_sheet.get_attendance_years", callback: function(r) { var year_filter = frappe.query_report_filters_by_name.year; year_filter.df.options = r.message; diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json b/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json similarity index 87% rename from erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json rename to erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json index a6531de22ea..e10f190e1c7 100644 --- a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json +++ b/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json @@ -7,9 +7,9 @@ "doctype": "Report", "idx": 3, "is_standard": "Yes", - "modified": "2017-02-24 20:02:41.910358", + "modified": "2017-11-10 19:42:43.376658", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "Student Monthly Attendance Sheet", "owner": "Administrator", "ref_doctype": "Student Attendance", diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py b/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py similarity index 98% rename from erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py rename to erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py index d869cec01df..0c7baa848fa 100644 --- a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py +++ b/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py @@ -6,7 +6,7 @@ import frappe from frappe.utils import cstr, cint, getdate, get_first_day, get_last_day, date_diff, add_days from frappe import msgprint, _ from calendar import monthrange -from erpnext.schools.api import get_student_group_students +from erpnext.education.api import get_student_group_students def execute(filters=None): if not filters: filters = {} diff --git a/erpnext/education/setup.py b/erpnext/education/setup.py new file mode 100644 index 00000000000..ed1d69e80de --- /dev/null +++ b/erpnext/education/setup.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals + +import frappe +from erpnext.setup.utils import insert_record + + +def setup_education(): + if frappe.db.exists('Academic Year', '2015-16'): + # already setup + return + create_academic_sessions() + +def create_academic_sessions(): + data = [ + {"doctype": "Academic Year", "academic_year_name": "2015-16"}, + {"doctype": "Academic Year", "academic_year_name": "2016-17"}, + {"doctype": "Academic Year", "academic_year_name": "2017-18"}, + {"doctype": "Academic Year", "academic_year_name": "2018-19"}, + {"doctype": "Academic Term", "academic_year": "2016-17", "term_name": "Semester 1"}, + {"doctype": "Academic Term", "academic_year": "2016-17", "term_name": "Semester 2"}, + {"doctype": "Academic Term", "academic_year": "2017-18", "term_name": "Semester 1"}, + {"doctype": "Academic Term", "academic_year": "2017-18", "term_name": "Semester 2"} + ] + insert_record(data) diff --git a/erpnext/schools/utils.py b/erpnext/education/utils.py similarity index 100% rename from erpnext/schools/utils.py rename to erpnext/education/utils.py diff --git a/erpnext/schools/web_form/__init__.py b/erpnext/education/web_form/__init__.py similarity index 100% rename from erpnext/schools/web_form/__init__.py rename to erpnext/education/web_form/__init__.py diff --git a/erpnext/schools/web_form/discussion/__init__.py b/erpnext/education/web_form/student_applicant/__init__.py similarity index 100% rename from erpnext/schools/web_form/discussion/__init__.py rename to erpnext/education/web_form/student_applicant/__init__.py diff --git a/erpnext/schools/web_form/student_applicant/student_applicant.js b/erpnext/education/web_form/student_applicant/student_applicant.js similarity index 100% rename from erpnext/schools/web_form/student_applicant/student_applicant.js rename to erpnext/education/web_form/student_applicant/student_applicant.js diff --git a/erpnext/schools/web_form/student_applicant/student_applicant.json b/erpnext/education/web_form/student_applicant/student_applicant.json similarity index 98% rename from erpnext/schools/web_form/student_applicant/student_applicant.json rename to erpnext/education/web_form/student_applicant/student_applicant.json index f87a147dde1..b1ad754c327 100644 --- a/erpnext/schools/web_form/student_applicant/student_applicant.json +++ b/erpnext/education/web_form/student_applicant/student_applicant.json @@ -16,9 +16,9 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2017-02-21 04:44:46.022738", + "modified": "2017-02-21 05:44:46.022738", "modified_by": "Administrator", - "module": "Schools", + "module": "Education", "name": "student-applicant", "owner": "Administrator", "payment_button_label": "Buy Now", diff --git a/erpnext/schools/web_form/student_applicant/student_applicant.py b/erpnext/education/web_form/student_applicant/student_applicant.py similarity index 100% rename from erpnext/schools/web_form/student_applicant/student_applicant.py rename to erpnext/education/web_form/student_applicant/student_applicant.py diff --git a/erpnext/healthcare/setup.py b/erpnext/healthcare/setup.py index 69a92b348ba..fca12704891 100644 --- a/erpnext/healthcare/setup.py +++ b/erpnext/healthcare/setup.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals import frappe from frappe import _ +from erpnext.setup.utils import insert_record def setup_healthcare(): if frappe.db.exists('Medical Department', 'Cardiology'): @@ -259,17 +260,3 @@ def create_sensitivity(): {"doctype": "Sensitivity", "sensitivity": _("Intermediate")} ] insert_record(records) - -def insert_record(records): - for r in records: - doc = frappe.new_doc(r.get("doctype")) - doc.update(r) - try: - doc.insert(ignore_permissions=True) - except frappe.DuplicateEntryError, e: - # pass DuplicateEntryError and continue - if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name: - # make sure DuplicateEntryError is for the exact same doc and not a related doc - pass - else: - raise diff --git a/erpnext/modules.txt b/erpnext/modules.txt index 79ded14573f..e918198d65e 100644 --- a/erpnext/modules.txt +++ b/erpnext/modules.txt @@ -13,7 +13,7 @@ Shopping Cart Hub Node Portal Maintenance -Schools +Education Regional Healthcare Restaurant diff --git a/erpnext/patches.txt b/erpnext/patches.txt index fa1990f9cc3..b7a40993e72 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -468,4 +468,5 @@ erpnext.patches.v9_2.delete_healthcare_domain_default_items erpnext.patches.v9_1.create_issue_opportunity_type erpnext.patches.v9_2.rename_translated_domains_in_en erpnext.patches.v9_0.set_shipping_type_for_existing_shipping_rules -erpnext.patches.v9_0.update_multi_uom_fields_in_material_request \ No newline at end of file +erpnext.patches.v9_0.update_multi_uom_fields_in_material_request +erpnext.patches.v10_0.rename_schools_to_education diff --git a/erpnext/schools/web_form/student_applicant/__init__.py b/erpnext/patches/v10_0/__init__.py similarity index 100% rename from erpnext/schools/web_form/student_applicant/__init__.py rename to erpnext/patches/v10_0/__init__.py diff --git a/erpnext/patches/v10_0/rename_schools_to_education.py b/erpnext/patches/v10_0/rename_schools_to_education.py new file mode 100644 index 00000000000..85c25a89434 --- /dev/null +++ b/erpnext/patches/v10_0/rename_schools_to_education.py @@ -0,0 +1,32 @@ +# Copyright (c) 2017, Frappe and Contributors +# License: GNU General Public License v3. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + # rename the School module as Education + + # rename the school module + if frappe.db.exists('Module Def', 'Schools') and not frappe.db.exists('Module Def', 'Education'): + frappe.rename_doc("Module Def", "Schools", "Education") + + # delete the school module + if frappe.db.exists('Module Def', 'Schools') and frappe.db.exists('Module Def', 'Education'): + frappe.db.sql("""delete from `tabModule Def` where module_name = 'Schools'""") + + + # rename "School Settings" to the "Education Settings + if frappe.db.exists('DocType', 'School Settings'): + frappe.rename_doc("DocType", "School Settings", "Education Settings", force=True) + frappe.reload_doc("education", "doctype", "education_settings") + + # delete the discussion web form if exists + if frappe.db.exists('Web Form', 'Discussion'): + frappe.db.sql("""delete from `tabWeb Form` where name = 'discussion'""") + + # rename the select option field from "School Bus" to "Institute's Bus" + frappe.reload_doc("education", "doctype", "Program Enrollment") + if "mode_of_transportation" in frappe.db.get_table_columns("Program Enrollment"): + frappe.db.sql("""update `tabProgram Enrollment` set mode_of_transportation = "Institute's Bus" + where mode_of_transportation = "School Bus" """) diff --git a/erpnext/patches/v7_0/make_guardian.py b/erpnext/patches/v7_0/make_guardian.py index 0839c4f6244..519969b38d1 100644 --- a/erpnext/patches/v7_0/make_guardian.py +++ b/erpnext/patches/v7_0/make_guardian.py @@ -5,9 +5,15 @@ def execute(): if frappe.db.exists("DocType", "Student"): student_table_cols = frappe.db.get_table_columns("Student") if "father_name" in student_table_cols: - frappe.reload_doc("schools", "doctype", "student") - frappe.reload_doc("schools", "doctype", "guardian") - frappe.reload_doc("schools", "doctype", "guardian_interest") + + # 'Schools' module changed to the 'Education' + # frappe.reload_doc("schools", "doctype", "student") + # frappe.reload_doc("schools", "doctype", "guardian") + # frappe.reload_doc("schools", "doctype", "guardian_interest") + + frappe.reload_doc("education", "doctype", "student") + frappe.reload_doc("education", "doctype", "guardian") + frappe.reload_doc("education", "doctype", "guardian_interest") frappe.reload_doc("hr", "doctype", "interest") fields = ["name", "father_name", "mother_name"] diff --git a/erpnext/patches/v7_0/migrate_schools_to_erpnext.py b/erpnext/patches/v7_0/migrate_schools_to_erpnext.py index f64f400feb5..9137b5aa92d 100644 --- a/erpnext/patches/v7_0/migrate_schools_to_erpnext.py +++ b/erpnext/patches/v7_0/migrate_schools_to_erpnext.py @@ -13,13 +13,20 @@ def execute(): frappe.db.sql("""delete from `tabDesktop Icon`""") if not frappe.db.exists('Module Def', 'Schools') and frappe.db.exists('Module Def', 'Academics'): - frappe.rename_doc("Module Def", "Academics", "Schools") + + # 'Schools' module changed to the 'Education' + # frappe.rename_doc("Module Def", "Academics", "Schools") + + frappe.rename_doc("Module Def", "Academics", "Education") remove_from_installed_apps("schools") def reload_doctypes_for_schools_icons(): - base_path = frappe.get_app_path('erpnext', 'schools', 'doctype') + # 'Schools' module changed to the 'Education' + # base_path = frappe.get_app_path('erpnext', 'schools', 'doctype') + + base_path = frappe.get_app_path('erpnext', 'education', 'doctype') for doctype in os.listdir(base_path): if os.path.exists(os.path.join(base_path, doctype, doctype + '.json')) \ and doctype not in ("fee_component", "assessment", "assessment_result"): - frappe.reload_doc('schools', 'doctype', doctype) \ No newline at end of file + frappe.reload_doc('education', 'doctype', doctype) \ No newline at end of file diff --git a/erpnext/patches/v7_0/rename_examination_to_assessment.py b/erpnext/patches/v7_0/rename_examination_to_assessment.py index 1d6e6882826..dc248de4fae 100644 --- a/erpnext/patches/v7_0/rename_examination_to_assessment.py +++ b/erpnext/patches/v7_0/rename_examination_to_assessment.py @@ -10,8 +10,14 @@ def execute(): if frappe.db.exists("DocType", "Examination"): frappe.rename_doc("DocType", "Examination", "Assessment") frappe.rename_doc("DocType", "Examination Result", "Assessment Result") - frappe.reload_doc("schools", "doctype", "assessment") - frappe.reload_doc("schools", "doctype", "assessment_result") + + # 'Schools' module changed to the 'Education' + # frappe.reload_doc("schools", "doctype", "assessment") + # frappe.reload_doc("schools", "doctype", "assessment_result") + + frappe.reload_doc("education", "doctype", "assessment") + frappe.reload_doc("education", "doctype", "assessment_result") + rename_field("Assessment", "exam_name", "assessment_name") rename_field("Assessment", "exam_code", "assessment_code") diff --git a/erpnext/patches/v7_0/set_portal_settings.py b/erpnext/patches/v7_0/set_portal_settings.py index 9bae1c54c03..5259d4fbd44 100644 --- a/erpnext/patches/v7_0/set_portal_settings.py +++ b/erpnext/patches/v7_0/set_portal_settings.py @@ -8,7 +8,9 @@ import frappe def execute(): frappe.reload_doctype('Role') for dt in ("assessment", "course", "fees"): - frappe.reload_doc("schools", "doctype", dt) + # 'Schools' module changed to the 'Education' + # frappe.reload_doc("schools", "doctype", dt) + frappe.reload_doc("education", "doctype", dt) for dt in ("domain", "has_domain", "domain_settings"): frappe.reload_doc("core", "doctype", dt) diff --git a/erpnext/patches/v7_1/set_student_guardian.py b/erpnext/patches/v7_1/set_student_guardian.py index e64279b8a82..0942505b568 100644 --- a/erpnext/patches/v7_1/set_student_guardian.py +++ b/erpnext/patches/v7_1/set_student_guardian.py @@ -2,9 +2,15 @@ import frappe def execute(): if frappe.db.exists("DocType", "Guardian"): - frappe.reload_doc("schools", "doctype", "student") - frappe.reload_doc("schools", "doctype", "student_guardian") - frappe.reload_doc("schools", "doctype", "student_sibling") + + # 'Schools' module changed to the 'Education' + # frappe.reload_doc("schools", "doctype", "student") + # frappe.reload_doc("schools", "doctype", "student_guardian") + # frappe.reload_doc("schools", "doctype", "student_sibling") + + frappe.reload_doc("education", "doctype", "student") + frappe.reload_doc("education", "doctype", "student_guardian") + frappe.reload_doc("education", "doctype", "student_sibling") if "student" not in frappe.db.get_table_columns("Guardian"): return guardian = frappe.get_all("Guardian", fields=["name", "student"]) diff --git a/erpnext/patches/v7_2/mark_students_active.py b/erpnext/patches/v7_2/mark_students_active.py index 3513cdeb344..0a2f2d3c105 100644 --- a/erpnext/patches/v7_2/mark_students_active.py +++ b/erpnext/patches/v7_2/mark_students_active.py @@ -1,5 +1,8 @@ import frappe def execute(): - frappe.reload_doc('schools', 'doctype', 'student_group_student') - frappe.db.sql("update `tabStudent Group Student` set active=1") + # 'Schools' module changed to the 'Education' + # frappe.reload_doc('schools', 'doctype', 'student_group_student') + + frappe.reload_doc('education', 'doctype', 'student_group_student') + frappe.db.sql("update `tabStudent Group Student` set active=1") diff --git a/erpnext/patches/v7_2/rename_evaluation_criteria.py b/erpnext/patches/v7_2/rename_evaluation_criteria.py index a45604fd812..d74976084be 100644 --- a/erpnext/patches/v7_2/rename_evaluation_criteria.py +++ b/erpnext/patches/v7_2/rename_evaluation_criteria.py @@ -2,28 +2,37 @@ import frappe from frappe.model.utils.rename_field import rename_field def execute(): + # 'Schools' module changed to the 'Education' + + frappe.rename_doc("DocType", "Evaluation Criteria", "Assessment Criteria", force=True) - frappe.reload_doc("schools", "doctype", "assessment_criteria") + # frappe.reload_doc("schools", "doctype", "assessment_criteria") + frappe.reload_doc("education", "doctype", "assessment_criteria") if 'evaluation_criteria' in frappe.db.get_table_columns('Assessment Criteria'): rename_field("Assessment Criteria", "evaluation_criteria", "assessment_criteria") frappe.rename_doc("DocType", "Assessment Evaluation Criteria", "Assessment Plan Criteria", force=True) - frappe.reload_doc("schools", "doctype", "assessment_plan_criteria") + # frappe.reload_doc("schools", "doctype", "assessment_plan_criteria") + frappe.reload_doc("education", "doctype", "assessment_plan_criteria") if 'evaluation_criteria' in frappe.db.get_table_columns('Assessment Plan'): rename_field("Assessment Plan Criteria", "evaluation_criteria", "assessment_criteria") - frappe.reload_doc("schools", "doctype", "assessment_plan") + # frappe.reload_doc("schools", "doctype", "assessment_plan") + frappe.reload_doc("education", "doctype", "assessment_plan") rename_field("Assessment Plan", "evaluation_criterias", "assessment_criteria") - frappe.reload_doc("schools", "doctype", "assessment_result_detail") + # frappe.reload_doc("schools", "doctype", "assessment_result_detail") + frappe.reload_doc("education", "doctype", "assessment_result_detail") if 'evaluation_criteria' in frappe.db.get_table_columns('Assessment Result Detail'): rename_field("Assessment Result Detail", "evaluation_criteria", "assessment_criteria") frappe.rename_doc("DocType", "Course Evaluation Criteria", "Course Assessment Criteria", force=True) - frappe.reload_doc("schools", "doctype", "course_assessment_criteria") + # frappe.reload_doc("schools", "doctype", "course_assessment_criteria") + frappe.reload_doc("education", "doctype", "course_assessment_criteria") if 'evaluation_criteria' in frappe.db.get_table_columns('Course Assessment Criteria'): rename_field("Course Assessment Criteria", "evaluation_criteria", "assessment_criteria") - frappe.reload_doc("schools", "doctype", "course") + # frappe.reload_doc("schools", "doctype", "course") + frappe.reload_doc("education", "doctype", "course") if 'evaluation_criteria' in frappe.db.get_table_columns('Course'): rename_field("Course", "evaluation_criterias", "assessment_criteria") diff --git a/erpnext/patches/v7_2/update_assessment_modules.py b/erpnext/patches/v7_2/update_assessment_modules.py index 9075bbf87db..37ae7c77f84 100644 --- a/erpnext/patches/v7_2/update_assessment_modules.py +++ b/erpnext/patches/v7_2/update_assessment_modules.py @@ -8,21 +8,28 @@ def execute(): if not frappe.db.exists("DocType", "Grading Scale Interval"): frappe.rename_doc("DocType", "Grade Interval", "Grading Scale Interval", force=True) - frappe.reload_doc("schools", "doctype", "grading_scale_interval") + # frappe.reload_doc("schools", "doctype", "grading_scale_interval") + frappe.reload_doc("education", "doctype", "grading_scale_interval") if "to_score" in frappe.db.get_table_columns("Grading Scale Interval"): rename_field("Grading Scale Interval", "to_score", "threshold") if not frappe.db.exists("DocType", "Assessment Plan"): frappe.rename_doc("DocType", "Assessment", "Assessment Plan", force=True) + # 'Schools' module changed to the 'Education' + # frappe.reload_doc("schools", "doctype", "assessment_plan") + #Rename Assessment Results - frappe.reload_doc("schools", "doctype", "assessment_plan") + frappe.reload_doc("education", "doctype", "assessment_plan") if "grading_structure" in frappe.db.get_table_columns("Assessment Plan"): rename_field("Assessment Plan", "grading_structure", "grading_scale") - frappe.reload_doc("schools", "doctype", "assessment_result") - frappe.reload_doc("schools", "doctype", "assessment_result_detail") - frappe.reload_doc("schools", "doctype", "assessment_criteria") + # frappe.reload_doc("schools", "doctype", "assessment_result") + # frappe.reload_doc("schools", "doctype", "assessment_result_detail") + # frappe.reload_doc("schools", "doctype", "assessment_criteria") + frappe.reload_doc("education", "doctype", "assessment_result") + frappe.reload_doc("education", "doctype", "assessment_result_detail") + frappe.reload_doc("education", "doctype", "assessment_criteria") for assessment in frappe.get_all("Assessment Plan", diff --git a/erpnext/patches/v7_2/update_guardian_name_in_student_master.py b/erpnext/patches/v7_2/update_guardian_name_in_student_master.py index 6ac40736375..163e7c3d19b 100644 --- a/erpnext/patches/v7_2/update_guardian_name_in_student_master.py +++ b/erpnext/patches/v7_2/update_guardian_name_in_student_master.py @@ -2,8 +2,12 @@ import frappe from frappe.model.utils.rename_field import rename_field def execute(): - frappe.reload_doc("schools", "doctype", "student_guardian") - student_guardians = frappe.get_all("Student Guardian", fields=["guardian"]) - for student_guardian in student_guardians: - guardian_name = frappe.db.get_value("Guardian", student_guardian.guardian, "guardian_name") - frappe.db.sql("update `tabStudent Guardian` set guardian_name = %s where guardian= %s", (guardian_name, student_guardian.guardian)) \ No newline at end of file + # 'Schools' module changed to the 'Education' + # frappe.reload_doc("schools", "doctype", "student_guardian") + frappe.reload_doc("education", "doctype", "student_guardian") + + student_guardians = frappe.get_all("Student Guardian", fields=["guardian"]) + for student_guardian in student_guardians: + guardian_name = frappe.db.get_value("Guardian", student_guardian.guardian, "guardian_name") + frappe.db.sql("update `tabStudent Guardian` set guardian_name = %s where guardian= %s", + (guardian_name, student_guardian.guardian)) \ No newline at end of file diff --git a/erpnext/patches/v8_0/merge_student_batch_and_student_group.py b/erpnext/patches/v8_0/merge_student_batch_and_student_group.py index ca71d36d090..fb9021fd687 100644 --- a/erpnext/patches/v8_0/merge_student_batch_and_student_group.py +++ b/erpnext/patches/v8_0/merge_student_batch_and_student_group.py @@ -11,7 +11,10 @@ def execute(): # for converting student batch into student group for doctype in ["Student Group", "Student Group Student", 'Program Enrollment', "Student Group Instructor", "Student Attendance", "Student", "Student Batch Name"]: - frappe.reload_doc("schools", "doctype", frappe.scrub(doctype)) + # 'Schools' module changed to the 'Education' + # frappe.reload_doc("schools", "doctype", frappe.scrub(doctype)) + + frappe.reload_doc("education", "doctype", frappe.scrub(doctype)) if frappe.db.table_exists("Student Batch"): student_batches = frappe.db.sql('''select name as student_group_name, student_batch_name as batch, diff --git a/erpnext/patches/v9_0/copy_old_fees_field_data.py b/erpnext/patches/v9_0/copy_old_fees_field_data.py index 4243c5bb62e..14278209c75 100644 --- a/erpnext/patches/v9_0/copy_old_fees_field_data.py +++ b/erpnext/patches/v9_0/copy_old_fees_field_data.py @@ -5,7 +5,9 @@ from __future__ import unicode_literals import frappe def execute(): - frappe.reload_doc("schools", "doctype", "fees") + # 'Schools' module changed to the 'Education' + # frappe.reload_doc("schools", "doctype", "fees") + frappe.reload_doc("education", "doctype", "fees") if "total_amount" not in frappe.db.get_table_columns("Fees"): return diff --git a/erpnext/patches/v9_0/student_admission_childtable_migrate.py b/erpnext/patches/v9_0/student_admission_childtable_migrate.py index 76b946d6375..a5712c76dcc 100644 --- a/erpnext/patches/v9_0/student_admission_childtable_migrate.py +++ b/erpnext/patches/v9_0/student_admission_childtable_migrate.py @@ -5,8 +5,11 @@ from __future__ import unicode_literals import frappe def execute(): - frappe.reload_doc('schools', 'doctype', 'student_admission_program') - frappe.reload_doc('schools', 'doctype', 'student_admission') + # 'Schools' module changed to the 'Education' + # frappe.reload_doc('schools', 'doctype', 'Student Admission Program') + # frappe.reload_doc('schools', 'doctype', 'student_admission') + frappe.reload_doc('education', 'doctype', 'Student Admission Program') + frappe.reload_doc('education', 'doctype', 'student_admission') if "program" not in frappe.db.get_table_columns("Student Admission"): return diff --git a/erpnext/public/build.json b/erpnext/public/build.json index 0730df96b2b..0bcbf710320 100644 --- a/erpnext/public/build.json +++ b/erpnext/public/build.json @@ -31,10 +31,10 @@ "public/js/templates/item_selector.html", "public/js/utils/item_selector.js", "public/js/help_links.js", - "public/js/schools/student_button.html", - "public/js/schools/assessment_result_tool.html", "public/js/templates/item_quick_entry.html", - "public/js/utils/item_quick_entry.js" + "public/js/utils/item_quick_entry.js", + "public/js/education/student_button.html", + "public/js/education/assessment_result_tool.html" ], "js/item-dashboard.min.js": [ "stock/dashboard/item_dashboard.html", diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js index 7c274f18db2..53b71086720 100644 --- a/erpnext/public/js/setup_wizard.js +++ b/erpnext/public/js/setup_wizard.js @@ -25,7 +25,7 @@ erpnext.setup.slides_settings = [ { "label": __("Manufacturing"), "value": "Manufacturing" }, { "label": __("Retail"), "value": "Retail" }, { "label": __("Services"), "value": "Services" }, - { "label": __("Education (beta)"), "value": "Education" }, + { "label": __("Education"), "value": "Education" }, {"label": __("Healthcare (beta)"), "value": "Healthcare"} ], reqd: 1 }, diff --git a/erpnext/schools/doctype/student_leave_application/student_leave_application.json b/erpnext/schools/doctype/student_leave_application/student_leave_application.json deleted file mode 100644 index a081e14ae27..00000000000 --- a/erpnext/schools/doctype/student_leave_application/student_leave_application.json +++ /dev/null @@ -1,357 +0,0 @@ -{ - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "autoname": "SLA.######", - "beta": 0, - "creation": "2016-11-28 15:38:54.793854", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", - "fields": [ - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "student", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 1, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Student", - "length": 0, - "no_copy": 0, - "options": "Student", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "student_name", - "fieldtype": "Read Only", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 1, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Student Name", - "length": 0, - "no_copy": 0, - "options": "student.title", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_3", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "from_date", - "fieldtype": "Date", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 1, - "label": "From Date", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "to_date", - "fieldtype": "Date", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "To Date", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "Will show the student as Present in Student Monthly Attendance Report", - "fieldname": "mark_as_present", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Mark as Present", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "section_break_5", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "reason", - "fieldtype": "Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Reason", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "amended_from", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Amended From", - "length": 0, - "no_copy": 1, - "options": "Student Leave Application", - "permlevel": 0, - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 1, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2017-07-17 21:57:57.804413", - "modified_by": "Administrator", - "module": "Schools", - "name": "Student Leave Application", - "name_case": "", - "owner": "Administrator", - "permissions": [ - { - "amend": 1, - "apply_user_permissions": 0, - "cancel": 1, - "create": 1, - "delete": 1, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Instructor", - "set_user_permissions": 0, - "share": 0, - "submit": 1, - "write": 1 - }, - { - "amend": 1, - "apply_user_permissions": 0, - "cancel": 1, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Academics User", - "set_user_permissions": 0, - "share": 1, - "submit": 1, - "write": 1 - } - ], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "restrict_to_domain": "Education", - "show_name_in_global_search": 1, - "sort_field": "modified", - "sort_order": "DESC", - "title_field": "student_name", - "track_changes": 0, - "track_seen": 0 -} \ No newline at end of file diff --git a/erpnext/schools/doctype/student_log/student_log.json b/erpnext/schools/doctype/student_log/student_log.json deleted file mode 100644 index 81d702687a9..00000000000 --- a/erpnext/schools/doctype/student_log/student_log.json +++ /dev/null @@ -1,400 +0,0 @@ -{ - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "autoname": "SLog.####", - "beta": 0, - "creation": "2016-07-29 03:27:22.451772", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", - "fields": [ - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "student", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 1, - "label": "Student", - "length": 0, - "no_copy": 0, - "options": "Student", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "student_name", - "fieldtype": "Read Only", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 1, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Student Name", - "length": 0, - "no_copy": 0, - "options": "student.title", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "type", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 1, - "label": "Type", - "length": 0, - "no_copy": 0, - "options": "General\nAcademic\nMedical\nAchievement", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "date", - "fieldtype": "Date", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Date", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_3", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "academic_year", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Academic Year", - "length": 0, - "no_copy": 0, - "options": "Academic Year", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "academic_term", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Academic Term", - "length": 0, - "no_copy": 0, - "options": "Academic Term", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "program", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Program", - "length": 0, - "no_copy": 0, - "options": "Program", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "student_batch", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Student Batch", - "length": 0, - "no_copy": 0, - "options": "Student Batch Name", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "section_break_5", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "log", - "fieldtype": "Text Editor", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 1, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Log", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2017-07-17 21:57:11.024049", - "modified_by": "Administrator", - "module": "Schools", - "name": "Student Log", - "name_case": "", - "owner": "Administrator", - "permissions": [ - { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Academics User", - "set_user_permissions": 0, - "share": 1, - "submit": 0, - "write": 1 - } - ], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "restrict_to_domain": "Education", - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "title_field": "student_name", - "track_changes": 0, - "track_seen": 1 -} \ No newline at end of file diff --git a/erpnext/schools/web_form/discussion/discussion.js b/erpnext/schools/web_form/discussion/discussion.js deleted file mode 100644 index 4130b0c4bdb..00000000000 --- a/erpnext/schools/web_form/discussion/discussion.js +++ /dev/null @@ -1,4 +0,0 @@ -frappe.ready(function() { - var form = $('form[data-web-form="discussion"]'), - owner = form.attr('data-owner'); -}) \ No newline at end of file diff --git a/erpnext/schools/web_form/discussion/discussion.json b/erpnext/schools/web_form/discussion/discussion.json deleted file mode 100644 index 4a781d19d8c..00000000000 --- a/erpnext/schools/web_form/discussion/discussion.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "allow_comments": 1, - "allow_delete": 1, - "allow_edit": 1, - "allow_multiple": 1, - "creation": "2016-06-26 20:46:09.598755", - "doc_type": "Discussion", - "docstatus": 0, - "doctype": "Web Form", - "idx": 0, - "is_standard": 1, - "login_required": 1, - "modified": "2016-07-19 07:55:37.826664", - "modified_by": "Administrator", - "module": "Schools", - "name": "discussion", - "owner": "Administrator", - "published": 1, - "route": "discussion", - "success_url": "", - "title": "Discussion", - "web_form_fields": [ - { - "fieldname": "course", - "fieldtype": "Data", - "hidden": 0, - "label": "Course", - "options": "Course", - "read_only": 1, - "reqd": 0 - }, - { - "fieldname": "subject", - "fieldtype": "Text", - "hidden": 0, - "label": "Subject", - "read_only": 0, - "reqd": 1 - }, - { - "fieldname": "description", - "fieldtype": "Text", - "hidden": 0, - "label": "Description", - "read_only": 0, - "reqd": 0 - } - ] -} \ No newline at end of file diff --git a/erpnext/schools/web_form/discussion/discussion.py b/erpnext/schools/web_form/discussion/discussion.py deleted file mode 100644 index 23ff05272f5..00000000000 --- a/erpnext/schools/web_form/discussion/discussion.py +++ /dev/null @@ -1,9 +0,0 @@ -from __future__ import unicode_literals - -import frappe - -def get_context(context=None): - pass - -def has_website_permission(doc, ptype, user, verbose=False): - return True \ No newline at end of file diff --git a/erpnext/setup/setup_wizard/sample_data.py b/erpnext/setup/setup_wizard/sample_data.py index e58b5f2e0c5..5a2fbd3ac58 100644 --- a/erpnext/setup/setup_wizard/sample_data.py +++ b/erpnext/setup/setup_wizard/sample_data.py @@ -107,16 +107,16 @@ def make_projects(domain): if domain == 'Education': tasks += [ { - "title": _("Setup your School in ERPNext"), + "title": _("Setup your Institute in ERPNext"), "start_date": current_date, "end_date": frappe.utils.add_days(current_date, 1), - "file": "school_masters.md" + "file": "education_masters.md" }, { "title": "Setup Master Data", "start_date": current_date, "end_date": frappe.utils.add_days(current_date, 1), - "file": "school_masters.md" + "file": "education_masters.md" }] else: diff --git a/erpnext/setup/setup_wizard/tasks/school_masters.md b/erpnext/setup/setup_wizard/tasks/education_masters.md similarity index 75% rename from erpnext/setup/setup_wizard/tasks/school_masters.md rename to erpnext/setup/setup_wizard/tasks/education_masters.md index 91039352b02..d0887d2d74d 100644 --- a/erpnext/setup/setup_wizard/tasks/school_masters.md +++ b/erpnext/setup/setup_wizard/tasks/education_masters.md @@ -6,4 +6,4 @@ Lets start making things in ERPNext that are representative of your institution. 1. Start adding **Students** 1. Group your students into **Batches** -Watch this video to learn more about ERPNext Schools: https://www.youtube.com/watch?v=f6foQOyGzdA +Watch this video to learn more about ERPNext Education: https://www.youtube.com/watch?v=f6foQOyGzdA diff --git a/erpnext/setup/setup_wizard/tasks/school_import_data.md b/erpnext/setup/setup_wizard/tasks/school_import_data.md index c465b812c8b..1fbe04906ef 100644 --- a/erpnext/setup/setup_wizard/tasks/school_import_data.md +++ b/erpnext/setup/setup_wizard/tasks/school_import_data.md @@ -1,5 +1,5 @@ Lets import some data! 💪💪 -If you are already running a school, you most likely have your Students in some spreadsheet file somewhere. Import it into ERPNext with the Data Import Tool. +If you are already running a Institute, you most likely have your Students in some spreadsheet file somewhere. Import it into ERPNext with the Data Import Tool. Watch this video to get started: https://www.youtube.com/watch?v=Ta2Xx3QoK3E \ No newline at end of file diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py index d77ebd16995..ffb3aa6926b 100644 --- a/erpnext/setup/utils.py +++ b/erpnext/setup/utils.py @@ -120,3 +120,18 @@ def enable_all_roles_and_domains(): frappe.get_single('Domain Settings').set_active_domains(\ [d.name for d in domains]) add_all_roles_to('Administrator') + + +def insert_record(records): + for r in records: + doc = frappe.new_doc(r.get("doctype")) + doc.update(r) + try: + doc.insert(ignore_permissions=True) + except frappe.DuplicateEntryError, e: + # pass DuplicateEntryError and continue + if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name: + # make sure DuplicateEntryError is for the exact same doc and not a related doc + pass + else: + raise diff --git a/erpnext/tests/ui/tests.txt b/erpnext/tests/ui/tests.txt index 0bbffa5666f..edf1d78ffbd 100644 --- a/erpnext/tests/ui/tests.txt +++ b/erpnext/tests/ui/tests.txt @@ -42,13 +42,13 @@ erpnext/hr/doctype/leave_type/test_leave_type.js erpnext/hr/doctype/leave_control_panel/test_leave_control_panel.js erpnext/hr/doctype/leave_allocation/test_leave_allocation.js erpnext/hr/doctype/leave_application/test_leave_application.js -erpnext/schools/doctype/academic_year/test_academic_year.js -erpnext/schools/doctype/academic_term/test_academic_term.js -erpnext/schools/doctype/school_settings/test_school_settings.js -erpnext/schools/doctype/student_batch_name/test_student_batch_name.js -erpnext/schools/doctype/student_category/test_student_category.js -erpnext/schools/doctype/room/test_room.js -erpnext/schools/doctype/instructor/test_instructor.js +erpnext/education/doctype/academic_year/test_academic_year.js +erpnext/education/doctype/academic_term/test_academic_term.js +erpnext/education/doctype/education_settings/test_education_settings.js +erpnext/education/doctype/student_batch_name/test_student_batch_name.js +erpnext/education/doctype/student_category/test_student_category.js +erpnext/education/doctype/room/test_room.js +erpnext/education/doctype/instructor/test_instructor.js erpnext/stock/doctype/warehouse/test_warehouse.js erpnext/manufacturing/doctype/production_order/test_production_order.js #long erpnext/accounts/page/pos/test_pos.js @@ -96,26 +96,26 @@ erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_item_wise_d erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_taxes_and_charges.js erpnext/buying/doctype/purchase_order/tests/test_purchase_order_receipt.js erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.js -erpnext/schools/doctype/grading_scale/test_grading_scale.js -erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.js -erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.js -erpnext/schools/doctype/course/test_course.js -erpnext/schools/doctype/program/test_program.js -erpnext/schools/doctype/guardian/test_guardian.js -erpnext/schools/doctype/student_admission/test_student_admission.js -erpnext/schools/doctype/student_applicant/tests/test_student_applicant_dummy_data.js -erpnext/schools/doctype/student_applicant/tests/test_student_applicant.js -erpnext/schools/doctype/student_applicant/tests/test_student_applicant_options.js -erpnext/schools/doctype/student_log/test_student_log.js -erpnext/schools/doctype/student_group/test_student_group.js -erpnext/schools/doctype/student_group_creation_tool/test_student_group_creation_tool.js -erpnext/schools/doctype/student_leave_application/test_student_leave_application.js -erpnext/schools/doctype/student_attendance_tool/test_student_attendance_tool.js -erpnext/schools/doctype/student_attendance/test_student_attendance.js -erpnext/schools/doctype/assessment_group/test_assessment_group.js -erpnext/schools/doctype/assessment_plan/test_assessment_plan.js -erpnext/schools/doctype/assessment_result/test_assessment_result.js -erpnext/schools/doctype/assessment_result_tool/test_assessment_result_tool.js +erpnext/education/doctype/grading_scale/test_grading_scale.js +erpnext/education/doctype/assessment_criteria_group/test_assessment_criteria_group.js +erpnext/education/doctype/assessment_criteria/test_assessment_criteria.js +erpnext/education/doctype/course/test_course.js +erpnext/education/doctype/program/test_program.js +erpnext/education/doctype/guardian/test_guardian.js +erpnext/education/doctype/student_admission/test_student_admission.js +erpnext/education/doctype/student_applicant/tests/test_student_applicant_dummy_data.js +erpnext/education/doctype/student_applicant/tests/test_student_applicant.js +erpnext/education/doctype/student_applicant/tests/test_student_applicant_options.js +erpnext/education/doctype/student_log/test_student_log.js +erpnext/education/doctype/student_group/test_student_group.js +erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.js +erpnext/education/doctype/student_leave_application/test_student_leave_application.js +erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.js +erpnext/education/doctype/student_attendance/test_student_attendance.js +erpnext/education/doctype/assessment_group/test_assessment_group.js +erpnext/education/doctype/assessment_plan/test_assessment_plan.js +erpnext/education/doctype/assessment_result/test_assessment_result.js +erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.js erpnext/accounts/doctype/journal_entry/test_journal_entry.js erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.js erpnext/accounts/doctype/payment_entry/tests/test_payment_entry.js diff --git a/erpnext/utilities/user_progress.py b/erpnext/utilities/user_progress.py index 250951159a3..685624e030f 100644 --- a/erpnext/utilities/user_progress.py +++ b/erpnext/utilities/user_progress.py @@ -140,7 +140,7 @@ def get_slide_settings(): ] ), - # School slides begin + # Education slides begin frappe._dict( action_name='Add Programs', domains=("Education"), @@ -219,7 +219,7 @@ def get_slide_settings(): done_state_title_route=["List", "Room"], help_links=[] ), - # School slides end + # Education slides end frappe._dict( action_name='Add Users', diff --git a/erpnext/utilities/user_progress_utils.py b/erpnext/utilities/user_progress_utils.py index 709da574c2b..1af5364d101 100644 --- a/erpnext/utilities/user_progress_utils.py +++ b/erpnext/utilities/user_progress_utils.py @@ -117,7 +117,7 @@ def make_item_price(item, price_list_name, item_price): "price_list_rate": item_price }).insert() -# Schools +# Education @frappe.whitelist() def create_program(args_data): args = json.loads(args_data) diff --git a/license.txt b/license.txt index 2a99aeee332..a238a97b060 100644 --- a/license.txt +++ b/license.txt @@ -663,7 +663,7 @@ program's commands might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or -school, if any, to sign a "copyright disclaimer" for the program, if +institute, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see .