Browse Source

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
develop
Manas Solanki 7 years ago
committed by Nabin Hait
parent
commit
966f141f62
  1. 1
      .eslintrc
  2. 16
      erpnext/config/desktop.py
  3. 2
      erpnext/config/education.py
  4. 0
      erpnext/demo/data/item_education.json
  5. 4
      erpnext/demo/demo.py
  6. 2
      erpnext/demo/setup/education.py
  7. 4
      erpnext/demo/setup/setup_data.py
  8. 8
      erpnext/demo/user/education.py
  9. 0
      erpnext/docs/assets/img/education/__init__.py
  10. 0
      erpnext/docs/assets/img/education/admission/__init__.py
  11. 0
      erpnext/docs/assets/img/education/admission/program-enrollment-tool.gif
  12. 0
      erpnext/docs/assets/img/education/admission/program-enrollment-tool01.gif
  13. 0
      erpnext/docs/assets/img/education/admission/program-enrollment.gif
  14. 0
      erpnext/docs/assets/img/education/admission/student-admission.gif
  15. 0
      erpnext/docs/assets/img/education/admission/student-applicant-enroll.png
  16. 0
      erpnext/docs/assets/img/education/admission/student-applicant.png
  17. 0
      erpnext/docs/assets/img/education/admission/student-application-actions.png
  18. 0
      erpnext/docs/assets/img/education/assessment/__init__.py
  19. 0
      erpnext/docs/assets/img/education/assessment/assessment-criteria.png
  20. 0
      erpnext/docs/assets/img/education/assessment/assessment-group-details.png
  21. 0
      erpnext/docs/assets/img/education/assessment/assessment-group-term.png
  22. 0
      erpnext/docs/assets/img/education/assessment/assessment-plan-criteria.png
  23. 0
      erpnext/docs/assets/img/education/assessment/assessment-plan-details.png
  24. 0
      erpnext/docs/assets/img/education/assessment/assessment-result-tool.png
  25. 0
      erpnext/docs/assets/img/education/assessment/assessment-result.png
  26. 0
      erpnext/docs/assets/img/education/assessment/grading-scale.png
  27. 0
      erpnext/docs/assets/img/education/fees/__init__.py
  28. 0
      erpnext/docs/assets/img/education/fees/fee-category.png
  29. 0
      erpnext/docs/assets/img/education/fees/fee-structure.png
  30. 0
      erpnext/docs/assets/img/education/fees/fees-section.png
  31. 0
      erpnext/docs/assets/img/education/fees/fees.png
  32. 0
      erpnext/docs/assets/img/education/home.png
  33. 0
      erpnext/docs/assets/img/education/module.png
  34. 0
      erpnext/docs/assets/img/education/schedule/__init__.py
  35. 0
      erpnext/docs/assets/img/education/schedule/course-schedule-att-1.png
  36. 0
      erpnext/docs/assets/img/education/schedule/course-schedule-att.png
  37. 0
      erpnext/docs/assets/img/education/schedule/course-schedule.png
  38. 0
      erpnext/docs/assets/img/education/schedule/examination.png
  39. 0
      erpnext/docs/assets/img/education/schedule/schedule-section.png
  40. 0
      erpnext/docs/assets/img/education/schedule/scheduling-tool.png
  41. 0
      erpnext/docs/assets/img/education/schedule/student-attendance.gif
  42. 0
      erpnext/docs/assets/img/education/schedule/student-attendance.png
  43. 0
      erpnext/docs/assets/img/education/schedule/student-leave-application.gif
  44. 0
      erpnext/docs/assets/img/education/setup/Course-schedule-error.png
  45. 0
      erpnext/docs/assets/img/education/setup/Room-Assesment-plan.png
  46. 0
      erpnext/docs/assets/img/education/setup/__init__.py
  47. 0
      erpnext/docs/assets/img/education/setup/academic-term.png
  48. 0
      erpnext/docs/assets/img/education/setup/academic-year.png
  49. 0
      erpnext/docs/assets/img/education/setup/course-fee-program.png
  50. 0
      erpnext/docs/assets/img/education/setup/course.png
  51. 0
      erpnext/docs/assets/img/education/setup/instructor.png
  52. 0
      erpnext/docs/assets/img/education/setup/program.png
  53. 0
      erpnext/docs/assets/img/education/setup/room.png
  54. 0
      erpnext/docs/assets/img/education/setup/student-attendance-tool.gif
  55. 0
      erpnext/docs/assets/img/education/setup/student-group-instructor.png
  56. 0
      erpnext/docs/assets/img/education/student/__init__.py
  57. 0
      erpnext/docs/assets/img/education/student/guardian.png
  58. 0
      erpnext/docs/assets/img/education/student/schools-settings.png
  59. 0
      erpnext/docs/assets/img/education/student/student group.gif
  60. 0
      erpnext/docs/assets/img/education/student/student-admission.gif
  61. 0
      erpnext/docs/assets/img/education/student/student-batch-validation.gif
  62. 0
      erpnext/docs/assets/img/education/student/student-batch.gif
  63. 0
      erpnext/docs/assets/img/education/student/student-course-validation.gif
  64. 0
      erpnext/docs/assets/img/education/student/student-group-attendance.gif
  65. 0
      erpnext/docs/assets/img/education/student/student-group-creation-tool.gif
  66. 0
      erpnext/docs/assets/img/education/student/student-log.png
  67. 0
      erpnext/docs/assets/img/education/student/student.png
  68. 0
      erpnext/docs/user/manual/en/education/Assessment/__init__.py
  69. 4
      erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md
  70. 0
      erpnext/docs/user/manual/en/education/Assessment/assessment_criteria_group.md
  71. 4
      erpnext/docs/user/manual/en/education/Assessment/assessment_group.md
  72. 4
      erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md
  73. 4
      erpnext/docs/user/manual/en/education/Assessment/assessment_result.md
  74. 2
      erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md
  75. 2
      erpnext/docs/user/manual/en/education/Assessment/grading_scale.md
  76. 0
      erpnext/docs/user/manual/en/education/Assessment/index.md
  77. 0
      erpnext/docs/user/manual/en/education/Assessment/index.txt
  78. 0
      erpnext/docs/user/manual/en/education/Attendance/__init__.py
  79. 0
      erpnext/docs/user/manual/en/education/Attendance/index.md
  80. 0
      erpnext/docs/user/manual/en/education/Attendance/index.txt
  81. 2
      erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md
  82. 2
      erpnext/docs/user/manual/en/education/Attendance/student-attendance.md
  83. 4
      erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md
  84. 0
      erpnext/docs/user/manual/en/education/__init__.py
  85. 0
      erpnext/docs/user/manual/en/education/admission/__init__.py
  86. 0
      erpnext/docs/user/manual/en/education/admission/index.md
  87. 0
      erpnext/docs/user/manual/en/education/admission/index.txt
  88. 4
      erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md
  89. 2
      erpnext/docs/user/manual/en/education/admission/program-enrollment.md
  90. 8
      erpnext/docs/user/manual/en/education/admission/student-applicant.md
  91. 4
      erpnext/docs/user/manual/en/education/admission/student_admission.md
  92. 0
      erpnext/docs/user/manual/en/education/fees/__init__.py
  93. 2
      erpnext/docs/user/manual/en/education/fees/fee-category.md
  94. 2
      erpnext/docs/user/manual/en/education/fees/fee-structure.md
  95. 8
      erpnext/docs/user/manual/en/education/fees/fees.md
  96. 2
      erpnext/docs/user/manual/en/education/fees/index.md
  97. 0
      erpnext/docs/user/manual/en/education/fees/index.txt
  98. 8
      erpnext/docs/user/manual/en/education/index.md
  99. 0
      erpnext/docs/user/manual/en/education/index.txt
  100. 0
      erpnext/docs/user/manual/en/education/schedule/__init__.py

1
.eslintrc

@ -52,6 +52,7 @@
"frappe": true, "frappe": true,
"erpnext": true, "erpnext": true,
"schools": true, "schools": true,
"education": true,
"$": true, "$": true,
"jQuery": true, "jQuery": true,

16
erpnext/config/desktop.py

@ -194,12 +194,12 @@ def get_data():
"type": "list" "type": "list"
}, },
{ {
"module_name": "Student Attendance", "module_name": "Student Attendance Tool",
"color": "#3aacba", "color": "#C0392B",
"icon": "octicon octicon-checklist", "icon": "octicon octicon-checklist",
"label": _("Student Attendance"), "label": _("Student Attendance Tool"),
"link": "List/Student Attendance", "link": "List/Student Attendance Tool",
"_doctype": "Student Attendance", "_doctype": "Student Attendance Tool",
"type": "list" "type": "list"
}, },
{ {
@ -257,11 +257,11 @@ def get_data():
"type": "list" "type": "list"
}, },
{ {
"module_name": "Schools", "module_name": "Education",
"color": "#DE2B37", "color": "#428B46",
"icon": "octicon octicon-mortar-board", "icon": "octicon octicon-mortar-board",
"type": "module", "type": "module",
"label": _("Schools") "label": _("Education")
}, },
{ {
"module_name": "Healthcare", "module_name": "Healthcare",

2
erpnext/config/schools.py → erpnext/config/education.py

@ -217,7 +217,7 @@ def get_data():
}, },
{ {
"type": "doctype", "type": "doctype",
"name": "School Settings" "name": "Education Settings"
} }
] ]
}, },

0
erpnext/demo/data/item_schools.json → erpnext/demo/data/item_education.json

4
erpnext/demo/demo.py

@ -3,7 +3,7 @@ from __future__ import unicode_literals
import frappe, sys import frappe, sys
import erpnext import erpnext
import frappe.utils 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 from erpnext.demo.setup import education, manufacture, setup_data, healthcare
""" """
Make a demo Make a demo
@ -83,7 +83,7 @@ def simulate(domain='Manufacturing', days=100):
sales.work() sales.work()
manufacturing.work() manufacturing.work()
elif domain=='Education': elif domain=='Education':
schools.work() education.work()
except: except:
frappe.db.set_global('demo_last_date', current_date) frappe.db.set_global('demo_last_date', current_date)

2
erpnext/demo/setup/education.py

@ -31,7 +31,7 @@ def make_masters():
frappe.db.commit() frappe.db.commit()
def setup_item(): 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: for i in items:
item = frappe.new_doc('Item') item = frappe.new_doc('Item')
item.update(i) item.update(i)

4
erpnext/demo/setup/setup_data.py

@ -229,10 +229,10 @@ def setup_user_roles():
user.add_roles('HR User', 'Projects User') user.add_roles('HR User', 'Projects User')
frappe.db.set_global('demo_projects_user', user.name) 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 = frappe.get_doc('User', 'aromn@example.com')
user.add_roles('Academics User') 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 #Add Expense Approver
user = frappe.get_doc('User', 'WanMai@example.com') user = frappe.get_doc('User', 'WanMai@example.com')

8
erpnext/demo/user/schools.py → erpnext/demo/user/education.py

@ -1,3 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
@ -8,13 +9,12 @@ import random
from frappe.utils import cstr from frappe.utils import cstr
from frappe.utils.make_random import get_random from frappe.utils.make_random import get_random
from datetime import timedelta 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 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(): 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): for d in xrange(20):
approve_random_student_applicant() approve_random_student_applicant()
enroll_random_student(frappe.flags.current_date) enroll_random_student(frappe.flags.current_date)

0
erpnext/docs/assets/img/schools/__init__.py → erpnext/docs/assets/img/education/__init__.py

0
erpnext/docs/assets/img/schools/admission/__init__.py → erpnext/docs/assets/img/education/admission/__init__.py

0
erpnext/docs/assets/img/schools/admission/program-enrollment-tool.gif → erpnext/docs/assets/img/education/admission/program-enrollment-tool.gif

Before

Width:  |  Height:  |  Size: 1.4 MiB

After

Width:  |  Height:  |  Size: 1.4 MiB

0
erpnext/docs/assets/img/schools/admission/program-enrollment-tool01.gif → erpnext/docs/assets/img/education/admission/program-enrollment-tool01.gif

Before

Width:  |  Height:  |  Size: 1019 KiB

After

Width:  |  Height:  |  Size: 1019 KiB

0
erpnext/docs/assets/img/schools/admission/program-enrollment.gif → erpnext/docs/assets/img/education/admission/program-enrollment.gif

Before

Width:  |  Height:  |  Size: 2.2 MiB

After

Width:  |  Height:  |  Size: 2.2 MiB

0
erpnext/docs/assets/img/schools/admission/student-admission.gif → erpnext/docs/assets/img/education/admission/student-admission.gif

Before

Width:  |  Height:  |  Size: 2.5 MiB

After

Width:  |  Height:  |  Size: 2.5 MiB

0
erpnext/docs/assets/img/schools/admission/student-applicant-enroll.png → erpnext/docs/assets/img/education/admission/student-applicant-enroll.png

Before

Width:  |  Height:  |  Size: 95 KiB

After

Width:  |  Height:  |  Size: 95 KiB

0
erpnext/docs/assets/img/schools/admission/student-applicant.png → erpnext/docs/assets/img/education/admission/student-applicant.png

Before

Width:  |  Height:  |  Size: 155 KiB

After

Width:  |  Height:  |  Size: 155 KiB

0
erpnext/docs/assets/img/schools/admission/student-application-actions.png → erpnext/docs/assets/img/education/admission/student-application-actions.png

Before

Width:  |  Height:  |  Size: 96 KiB

After

Width:  |  Height:  |  Size: 96 KiB

0
erpnext/docs/assets/img/schools/assessment/__init__.py → erpnext/docs/assets/img/education/assessment/__init__.py

0
erpnext/docs/assets/img/schools/assessment/assessment-criteria.png → erpnext/docs/assets/img/education/assessment/assessment-criteria.png

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 55 KiB

0
erpnext/docs/assets/img/schools/assessment/assessment-group-details.png → erpnext/docs/assets/img/education/assessment/assessment-group-details.png

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 108 KiB

0
erpnext/docs/assets/img/schools/assessment/assessment-group-term.png → erpnext/docs/assets/img/education/assessment/assessment-group-term.png

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

0
erpnext/docs/assets/img/schools/assessment/assessment-plan-criteria.png → erpnext/docs/assets/img/education/assessment/assessment-plan-criteria.png

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 79 KiB

0
erpnext/docs/assets/img/schools/assessment/assessment-plan-details.png → erpnext/docs/assets/img/education/assessment/assessment-plan-details.png

Before

Width:  |  Height:  |  Size: 185 KiB

After

Width:  |  Height:  |  Size: 185 KiB

0
erpnext/docs/assets/img/schools/assessment/assessment-result-tool.png → erpnext/docs/assets/img/education/assessment/assessment-result-tool.png

Before

Width:  |  Height:  |  Size: 181 KiB

After

Width:  |  Height:  |  Size: 181 KiB

0
erpnext/docs/assets/img/schools/assessment/assessment-result.png → erpnext/docs/assets/img/education/assessment/assessment-result.png

Before

Width:  |  Height:  |  Size: 170 KiB

After

Width:  |  Height:  |  Size: 170 KiB

0
erpnext/docs/assets/img/schools/assessment/grading-scale.png → erpnext/docs/assets/img/education/assessment/grading-scale.png

Before

Width:  |  Height:  |  Size: 155 KiB

After

Width:  |  Height:  |  Size: 155 KiB

0
erpnext/docs/assets/img/schools/fees/__init__.py → erpnext/docs/assets/img/education/fees/__init__.py

0
erpnext/docs/assets/img/schools/fees/fee-category.png → erpnext/docs/assets/img/education/fees/fee-category.png

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 73 KiB

0
erpnext/docs/assets/img/schools/fees/fee-structure.png → erpnext/docs/assets/img/education/fees/fee-structure.png

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 77 KiB

0
erpnext/docs/assets/img/schools/fees/fees-section.png → erpnext/docs/assets/img/education/fees/fees-section.png

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

0
erpnext/docs/assets/img/schools/fees/fees.png → erpnext/docs/assets/img/education/fees/fees.png

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 104 KiB

0
erpnext/docs/assets/img/schools/home.png → erpnext/docs/assets/img/education/home.png

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

0
erpnext/docs/assets/img/schools/module.png → erpnext/docs/assets/img/education/module.png

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 94 KiB

0
erpnext/docs/assets/img/schools/schedule/__init__.py → erpnext/docs/assets/img/education/schedule/__init__.py

0
erpnext/docs/assets/img/schools/schedule/course-schedule-att-1.png → erpnext/docs/assets/img/education/schedule/course-schedule-att-1.png

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 76 KiB

0
erpnext/docs/assets/img/schools/schedule/course-schedule-att.png → erpnext/docs/assets/img/education/schedule/course-schedule-att.png

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 101 KiB

0
erpnext/docs/assets/img/schools/schedule/course-schedule.png → erpnext/docs/assets/img/education/schedule/course-schedule.png

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 112 KiB

0
erpnext/docs/assets/img/schools/schedule/examination.png → erpnext/docs/assets/img/education/schedule/examination.png

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 75 KiB

0
erpnext/docs/assets/img/schools/schedule/schedule-section.png → erpnext/docs/assets/img/education/schedule/schedule-section.png

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 43 KiB

0
erpnext/docs/assets/img/schools/schedule/scheduling-tool.png → erpnext/docs/assets/img/education/schedule/scheduling-tool.png

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

0
erpnext/docs/assets/img/schools/schedule/student-attendance.gif → erpnext/docs/assets/img/education/schedule/student-attendance.gif

Before

Width:  |  Height:  |  Size: 150 KiB

After

Width:  |  Height:  |  Size: 150 KiB

0
erpnext/docs/assets/img/schools/schedule/student-attendance.png → erpnext/docs/assets/img/education/schedule/student-attendance.png

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 54 KiB

0
erpnext/docs/assets/img/schools/schedule/student-leave-application.gif → erpnext/docs/assets/img/education/schedule/student-leave-application.gif

Before

Width:  |  Height:  |  Size: 2.1 MiB

After

Width:  |  Height:  |  Size: 2.1 MiB

0
erpnext/docs/assets/img/schools/setup/Course-schedule-error.png → erpnext/docs/assets/img/education/setup/Course-schedule-error.png

Before

Width:  |  Height:  |  Size: 87 KiB

After

Width:  |  Height:  |  Size: 87 KiB

0
erpnext/docs/assets/img/schools/setup/Room-Assesment-plan.png → erpnext/docs/assets/img/education/setup/Room-Assesment-plan.png

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 86 KiB

0
erpnext/docs/assets/img/schools/setup/__init__.py → erpnext/docs/assets/img/education/setup/__init__.py

0
erpnext/docs/assets/img/schools/setup/academic-term.png → erpnext/docs/assets/img/education/setup/academic-term.png

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 63 KiB

0
erpnext/docs/assets/img/schools/setup/academic-year.png → erpnext/docs/assets/img/education/setup/academic-year.png

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

0
erpnext/docs/assets/img/schools/setup/course-fee-program.png → erpnext/docs/assets/img/education/setup/course-fee-program.png

Before

Width:  |  Height:  |  Size: 111 KiB

After

Width:  |  Height:  |  Size: 111 KiB

0
erpnext/docs/assets/img/schools/setup/course.png → erpnext/docs/assets/img/education/setup/course.png

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

0
erpnext/docs/assets/img/schools/setup/instructor.png → erpnext/docs/assets/img/education/setup/instructor.png

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 106 KiB

0
erpnext/docs/assets/img/schools/setup/program.png → erpnext/docs/assets/img/education/setup/program.png

Before

Width:  |  Height:  |  Size: 119 KiB

After

Width:  |  Height:  |  Size: 119 KiB

0
erpnext/docs/assets/img/schools/setup/room.png → erpnext/docs/assets/img/education/setup/room.png

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 55 KiB

0
erpnext/docs/assets/img/schools/setup/student-attendance-tool.gif → erpnext/docs/assets/img/education/setup/student-attendance-tool.gif

Before

Width:  |  Height:  |  Size: 376 KiB

After

Width:  |  Height:  |  Size: 376 KiB

0
erpnext/docs/assets/img/schools/setup/student-group-instructor.png → erpnext/docs/assets/img/education/setup/student-group-instructor.png

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 81 KiB

0
erpnext/docs/assets/img/schools/student/__init__.py → erpnext/docs/assets/img/education/student/__init__.py

0
erpnext/docs/assets/img/schools/student/guardian.png → erpnext/docs/assets/img/education/student/guardian.png

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 88 KiB

0
erpnext/docs/assets/img/schools/student/schools-settings.png → erpnext/docs/assets/img/education/student/schools-settings.png

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 103 KiB

0
erpnext/docs/assets/img/schools/student/student group.gif → erpnext/docs/assets/img/education/student/student group.gif

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 1.0 MiB

0
erpnext/docs/assets/img/schools/student/student-admission.gif → erpnext/docs/assets/img/education/student/student-admission.gif

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

0
erpnext/docs/assets/img/schools/student/student-batch-validation.gif → erpnext/docs/assets/img/education/student/student-batch-validation.gif

Before

Width:  |  Height:  |  Size: 550 KiB

After

Width:  |  Height:  |  Size: 550 KiB

0
erpnext/docs/assets/img/schools/student/student-batch.gif → erpnext/docs/assets/img/education/student/student-batch.gif

Before

Width:  |  Height:  |  Size: 366 KiB

After

Width:  |  Height:  |  Size: 366 KiB

0
erpnext/docs/assets/img/schools/student/student-course-validation.gif → erpnext/docs/assets/img/education/student/student-course-validation.gif

Before

Width:  |  Height:  |  Size: 985 KiB

After

Width:  |  Height:  |  Size: 985 KiB

0
erpnext/docs/assets/img/schools/student/student-group-attendance.gif → erpnext/docs/assets/img/education/student/student-group-attendance.gif

Before

Width:  |  Height:  |  Size: 647 KiB

After

Width:  |  Height:  |  Size: 647 KiB

0
erpnext/docs/assets/img/schools/student/student-group-creation-tool.gif → erpnext/docs/assets/img/education/student/student-group-creation-tool.gif

Before

Width:  |  Height:  |  Size: 991 KiB

After

Width:  |  Height:  |  Size: 991 KiB

0
erpnext/docs/assets/img/schools/student/student-log.png → erpnext/docs/assets/img/education/student/student-log.png

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 79 KiB

0
erpnext/docs/assets/img/schools/student/student.png → erpnext/docs/assets/img/education/student/student.png

Before

Width:  |  Height:  |  Size: 173 KiB

After

Width:  |  Height:  |  Size: 173 KiB

0
erpnext/docs/user/manual/en/schools/Assessment/__init__.py → erpnext/docs/user/manual/en/education/Assessment/__init__.py

4
erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria.md → 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 is the parameter based on which you assess the Student.
<img class="screenshot" alt="Assessment Criteria" src="/docs/assets/img/schools/assessment/assessment-criteria.png"> <img class="screenshot" alt="Assessment Criteria" src="/docs/assets/img/education/assessment/assessment-criteria.png">
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. 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 Criteria is be used when scheduling Assessment Plan for Student Group and Course.
<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/schools/assessment/assessment-plan-criteria.png"> <img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/education/assessment/assessment-plan-criteria.png">
{next} {next}

0
erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria_group.md → erpnext/docs/user/manual/en/education/Assessment/assessment_criteria_group.md

4
erpnext/docs/user/manual/en/schools/Assessment/assessment_group.md → 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. For example, if you conduct two assessment in a academic year, then setup Assessment Group as following.
<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/schools/assessment/assessment-group-term.png"> <img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/education/assessment/assessment-group-term.png">
On the same lines, you can also define multiple Assessment Group bases on assessment conducted in your institute. On the same lines, you can also define multiple Assessment Group bases on assessment conducted in your institute.
<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/schools/assessment/assessment-group-details.png"> <img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/education/assessment/assessment-group-details.png">
{next} {next}

4
erpnext/docs/user/manual/en/schools/Assessment/assessment_plan.md → 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 4. Examiner and Supervisor
<img class="screenshot" alt="Assessment Plan Details" src="/docs/assets/img/schools/assessment/assessment-plan-details.png"> <img class="screenshot" alt="Assessment Plan Details" src="/docs/assets/img/education/assessment/assessment-plan-details.png">
5. Assessment Criteria is list of criteria based which each student in will be evaluated and grades will be assigned. 5. Assessment Criteria is list of criteria based which each student in will be evaluated and grades will be assigned.
<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/schools/assessment/assessment-plan-criteria.png"> <img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/education/assessment/assessment-plan-criteria.png">
{next} {next}

4
erpnext/docs/user/manual/en/schools/Assessment/assessment_result.md → erpnext/docs/user/manual/en/education/Assessment/assessment_result.md

@ -1,7 +1,7 @@
#Assessment Result #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).
<img class="screenshot" alt="Assessment Result" src="/docs/assets/img/schools/assessment/assessment-result.png"> <img class="screenshot" alt="Assessment Result" src="/docs/assets/img/education/assessment/assessment-result.png">
{next} {next}

2
erpnext/docs/user/manual/en/schools/Assessment/assessment_result_tool.md → 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 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.
<img class="screenshot" alt="Assessment Result Tool" src="/docs/assets/img/schools/assessment/assessment-result-tool.png"> <img class="screenshot" alt="Assessment Result Tool" src="/docs/assets/img/education/assessment/assessment-result-tool.png">
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. 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.

2
erpnext/docs/user/manual/en/schools/Assessment/grading_scale.md → 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. 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.
<img class="screenshot" alt="Grading Scale" src="/docs/assets/img/schools/assessment/grading-scale.png"> <img class="screenshot" alt="Grading Scale" src="/docs/assets/img/education/assessment/grading-scale.png">
{next} {next}

0
erpnext/docs/user/manual/en/schools/Assessment/index.md → erpnext/docs/user/manual/en/education/Assessment/index.md

0
erpnext/docs/user/manual/en/schools/Assessment/index.txt → erpnext/docs/user/manual/en/education/Assessment/index.txt

0
erpnext/docs/user/manual/en/schools/Attendance/__init__.py → erpnext/docs/user/manual/en/education/Attendance/__init__.py

0
erpnext/docs/user/manual/en/schools/Attendance/index.md → erpnext/docs/user/manual/en/education/Attendance/index.md

0
erpnext/docs/user/manual/en/schools/Attendance/index.txt → erpnext/docs/user/manual/en/education/Attendance/index.txt

2
erpnext/docs/user/manual/en/schools/Attendance/student-attendance-tool.md → 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 detials will be autofetched and you can mark the attendance of the given date.
<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/schools/setup/student-attendance-tool.gif"> <img class="screenshot" alt="Student Attendance" src="/docs/assets/img/education/setup/student-attendance-tool.gif">
{next} {next}

2
erpnext/docs/user/manual/en/schools/Attendance/student-attendance.md → 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. 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.
<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/schools/schedule/student-attendance.gif"> <img class="screenshot" alt="Student Attendance" src="/docs/assets/img/education/schedule/student-attendance.gif">
**Student Attendance tool** can be used for bulk updation of the attendance based on **Batch, Course or Activity**. **Student Attendance tool** can be used for bulk updation of the attendance based on **Batch, Course or Activity**.

4
erpnext/docs/user/manual/en/schools/Attendance/student-leave-application.md → 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. To create a Student Leave application record, enter the Student and the date for the leave is applied and save.
<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/schools/schedule/student-leave-application.gif"> <img class="screenshot" alt="Student Attendance" src="/docs/assets/img/education/schedule/student-leave-application.gif">
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. 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.

0
erpnext/docs/user/manual/en/schools/__init__.py → erpnext/docs/user/manual/en/education/__init__.py

0
erpnext/docs/user/manual/en/schools/admission/__init__.py → erpnext/docs/user/manual/en/education/admission/__init__.py

0
erpnext/docs/user/manual/en/schools/admission/index.md → erpnext/docs/user/manual/en/education/admission/index.md

0
erpnext/docs/user/manual/en/schools/admission/index.txt → erpnext/docs/user/manual/en/education/admission/index.txt

4
erpnext/docs/user/manual/en/schools/admission/program-enrollment-tool.md → 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**. 1. **Student Applicants** >> List of Student Applicants will be fetched for the selected **Program** and **Academic year**.
<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/program-enrollment-tool.gif"> <img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/program-enrollment-tool.gif">
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**. 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**.
<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/program-enrollment-tool01.gif"> <img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/program-enrollment-tool01.gif">
{next} {next}

2
erpnext/docs/user/manual/en/schools/admission/program-enrollment.md → 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. Once a student have applied for the **Program** and the application is approved, the program enrollment is done for that student.
<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/program-enrollment.gif"> <img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/program-enrollment.gif">
- A student can be enrolled in multiple Course for a program in a given academeic year. - 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. - Based on the Fee structure selected at the time of enrollment Fee detials are created of the student.

8
erpnext/docs/user/manual/en/schools/admission/student-applicant.md → 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. 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. You can Approve or Reject a student applicant. By accepting a student applicant you can add them to the student master.
<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/schools/admission/student-applicant.png"> <img class="screenshot" alt="Student Applicant" src="/docs/assets/img/education/admission/student-applicant.png">
### Application Status ### Application Status
@ -20,11 +20,11 @@ You can Approve or Reject a student applicant. By accepting a student applicant
### Student Enrollment ### Student Enrollment
Once the form is submitted you can either approve or reject the application form. Once the form is submitted you can either approve or reject the application form.
<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/student-application-actions.png"> <img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/student-application-actions.png">
Once you approve a Student Applicant you can enroll them to a program. When you click the 'Enroll' buttom, 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).
<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/student-applicant-enroll.png"> <img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/student-applicant-enroll.png">
{next} {next}

4
erpnext/docs/user/manual/en/schools/admission/student_admission.md → 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 : To create a Student Admission record go to :
**Schools** >> **Admissions** >> **Student Admission** >> **education** >> **Admissions** >> **Student Admission** >>
<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/schools/admission/student-admission.gif"> <img class="screenshot" alt="Student Applicant" src="/docs/assets/img/education/admission/student-admission.gif">
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. 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.

0
erpnext/docs/user/manual/en/schools/fees/__init__.py → erpnext/docs/user/manual/en/education/fees/__init__.py

2
erpnext/docs/user/manual/en/schools/fees/fee-category.md → erpnext/docs/user/manual/en/education/fees/fee-category.md

@ -2,6 +2,6 @@
List of all different type of fees collected. List of all different type of fees collected.
<img class="screenshot" alt="Fees Category" src="/docs/assets/img/schools/fees/fee-category.png"> <img class="screenshot" alt="Fees Category" src="/docs/assets/img/education/fees/fee-category.png">
{next} {next}

2
erpnext/docs/user/manual/en/schools/fees/fee-structure.md → 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. A Fee Structure is a template that can be used while making fee records.
<img class="screenshot" alt="Fees Structure" src="/docs/assets/img/schools/fees/fee-structure.png"> <img class="screenshot" alt="Fees Structure" src="/docs/assets/img/education/fees/fee-structure.png">
{next} {next}

8
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.
<img class="screenshot" alt="Fees" src="/docs/assets/img/education/fees/fees.png">
{next}

2
erpnext/docs/user/manual/en/schools/fees/index.md → erpnext/docs/user/manual/en/education/fees/index.md

@ -2,7 +2,7 @@
This section contains 'Fee' related documents. This section contains 'Fee' related documents.
<img class="screenshot" alt="Fees Section" src="/docs/assets/img/schools/fees/fees-section.png"> <img class="screenshot" alt="Fees Section" src="/docs/assets/img/education/fees/fees-section.png">
### Topics ### Topics

0
erpnext/docs/user/manual/en/schools/fees/index.txt → erpnext/docs/user/manual/en/education/fees/index.txt

8
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.
<img class="screenshot" alt="Fees Section" src="/docs/assets/img/education/module.png">
{index}

0
erpnext/docs/user/manual/en/schools/index.txt → erpnext/docs/user/manual/en/education/index.txt

0
erpnext/docs/user/manual/en/schools/schedule/__init__.py → erpnext/docs/user/manual/en/education/schedule/__init__.py

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save