changes in the education module (#12827)
update the module page
remove fee from betadiff --git a/erpnext/config/education.py b/erpnext/config/education.py
index 08846a2..e4e77f3 100644
--- a/erpnext/config/education.py
+++ b/erpnext/config/education.py
@@ -21,18 +21,7 @@
{
"type": "doctype",
"name": "Student Group"
- },
- {
- "type": "doctype",
- "name": "Student Group Creation Tool"
- },
- {
- "type": "report",
- "is_query_report": True,
- "name": "Student and Guardian Contact Details",
- "doctype": "Program Enrollment"
}
-
]
},
{
@@ -50,10 +39,6 @@
{
"type": "doctype",
"name": "Program Enrollment"
- },
- {
- "type": "doctype",
- "name": "Program Enrollment Tool"
}
]
},
@@ -69,10 +54,6 @@
"name": "Student Leave Application"
},
{
- "type": "doctype",
- "name": "Student Attendance Tool"
- },
- {
"type": "report",
"is_query_report": True,
"name": "Absent Student Report",
@@ -84,21 +65,26 @@
"name": "Student Batch-Wise Attendance",
"doctype": "Student Attendance"
},
- {
- "type": "report",
- "is_query_report": True,
- "name": "Student Monthly Attendance Sheet",
- "doctype": "Student Attendance"
- }
]
},
{
- "label": _("Schedule"),
+ "label": _("Tools"),
"items": [
{
"type": "doctype",
- "name": "Course Schedule",
- "route": "List/Course Schedule/Calendar"
+ "name": "Student Attendance Tool"
+ },
+ {
+ "type": "doctype",
+ "name": "Assessment Result Tool"
+ },
+ {
+ "type": "doctype",
+ "name": "Student Group Creation Tool"
+ },
+ {
+ "type": "doctype",
+ "name": "Program Enrollment Tool"
},
{
"type": "doctype",
@@ -125,15 +111,12 @@
{
"type": "doctype",
"name": "Assessment Criteria"
- },
- {
- "type": "doctype",
- "name": "Assessment Criteria Group"
- },
- {
- "type": "doctype",
- "name": "Assessment Result Tool"
- },
+ }
+ ]
+ },
+ {
+ "label": _("Assessment Reports"),
+ "items": [
{
"type": "report",
"is_query_report": True,
@@ -143,10 +126,15 @@
{
"type": "report",
"is_query_report": True,
+ "name": "Final Assessment Grades",
+ "doctype": "Assessment Result"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
"name": "Assessment Plan Status",
"doctype": "Assessment Plan"
},
-
]
},
{
@@ -167,17 +155,25 @@
{
"type": "doctype",
"name": "Fee Category"
- },
- {
- "type": "report",
- "name": "Student Fee Collection",
- "doctype": "Fees",
- "is_query_report": True
}
]
},
{
- "label": _("Setup"),
+ "label": _("Schedule"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Course Schedule",
+ "route": "List/Course Schedule/Calendar"
+ },
+ {
+ "type": "doctype",
+ "name": "Course Scheduling Tool"
+ }
+ ]
+ },
+ {
+ "label": _("Masters"),
"items": [
{
"type": "doctype",
@@ -194,7 +190,12 @@
{
"type": "doctype",
"name": "Room"
- },
+ }
+ ]
+ },
+ {
+ "label": _("Setup"),
+ "items": [
{
"type": "doctype",
"name": "Student Category"
@@ -221,4 +222,27 @@
}
]
},
+ {
+ "label": _("Other Reports"),
+ "items": [
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Student and Guardian Contact Details",
+ "doctype": "Program Enrollment"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Student Monthly Attendance Sheet",
+ "doctype": "Student Attendance"
+ },
+ {
+ "type": "report",
+ "name": "Student Fee Collection",
+ "doctype": "Fees",
+ "is_query_report": True
+ }
+ ]
+ }
]
diff --git a/erpnext/education/doctype/fees/fees.json b/erpnext/education/doctype/fees/fees.json
index c4e1f82..971197c 100644
--- a/erpnext/education/doctype/fees/fees.json
+++ b/erpnext/education/doctype/fees/fees.json
@@ -4,7 +4,7 @@
"allow_import": 1,
"allow_rename": 0,
"autoname": "naming_series:",
- "beta": 1,
+ "beta": 0,
"creation": "2015-09-22 16:57:22.143710",
"custom": 0,
"docstatus": 0,
@@ -1276,7 +1276,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-12-06 05:55:10.502567",
+ "modified": "2018-02-08 02:12:34.185245",
"modified_by": "Administrator",
"module": "Education",
"name": "Fees",
diff --git a/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.json b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.json
index e153f8c..61976b4 100644
--- a/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.json
+++ b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.json
@@ -7,7 +7,7 @@
"doctype": "Report",
"idx": 0,
"is_standard": "Yes",
- "modified": "2017-11-10 19:41:46.641227",
+ "modified": "2018-02-08 15:11:24.904628",
"modified_by": "Administrator",
"module": "Education",
"name": "Course wise Assessment Report",
@@ -17,7 +17,10 @@
"report_type": "Script Report",
"roles": [
{
- "role": "Academics User"
+ "role": "Instructor"
+ },
+ {
+ "role": "Education Manager"
}
]
}
\ No newline at end of file
diff --git a/erpnext/education/report/final_assessment_grades/final_assessment_grades.json b/erpnext/education/report/final_assessment_grades/final_assessment_grades.json
index 1efbb6e..e748efa 100644
--- a/erpnext/education/report/final_assessment_grades/final_assessment_grades.json
+++ b/erpnext/education/report/final_assessment_grades/final_assessment_grades.json
@@ -8,7 +8,7 @@
"idx": 0,
"is_standard": "Yes",
"letter_head": "Shishuvan Secondary School",
- "modified": "2018-01-22 17:04:43.412054",
+ "modified": "2018-02-08 15:11:35.339434",
"modified_by": "Administrator",
"module": "Education",
"name": "Final Assessment Grades",
@@ -16,5 +16,12 @@
"ref_doctype": "Assessment Result",
"report_name": "Final Assessment Grades",
"report_type": "Script Report",
- "roles": []
+ "roles": [
+ {
+ "role": "Instructor"
+ },
+ {
+ "role": "Education Manager"
+ }
+ ]
}
\ No newline at end of file