Minor fixes for the Education domain (#11758)
* add the new role Education Manager for education settings
* minor changes in the hooks for bootinfo
* Fix for amending the assessment plan
diff --git a/erpnext/education/doctype/assessment_plan/assessment_plan.json b/erpnext/education/doctype/assessment_plan/assessment_plan.json
index 9dbba4f..e2ae247 100644
--- a/erpnext/education/doctype/assessment_plan/assessment_plan.json
+++ b/erpnext/education/doctype/assessment_plan/assessment_plan.json
@@ -276,7 +276,7 @@
"in_standard_filter": 0,
"label": "Schedule Date",
"length": 0,
- "no_copy": 0,
+ "no_copy": 1,
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -427,7 +427,7 @@
"in_standard_filter": 0,
"label": "From Time",
"length": 0,
- "no_copy": 0,
+ "no_copy": 1,
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -457,7 +457,7 @@
"in_standard_filter": 0,
"label": "To Time",
"length": 0,
- "no_copy": 0,
+ "no_copy": 1,
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -633,7 +633,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-11-10 19:12:10.383524",
+ "modified": "2017-11-28 17:23:36.657725",
"modified_by": "Administrator",
"module": "Education",
"name": "Assessment Plan",
diff --git a/erpnext/education/doctype/education_settings/education_settings.json b/erpnext/education/doctype/education_settings/education_settings.json
index 2771ad6..a0b8e99 100644
--- a/erpnext/education/doctype/education_settings/education_settings.json
+++ b/erpnext/education/doctype/education_settings/education_settings.json
@@ -267,7 +267,7 @@
"issingle": 1,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-11-16 13:23:06.124735",
+ "modified": "2017-11-28 15:45:30.324324",
"modified_by": "Administrator",
"module": "Education",
"name": "Education Settings",
@@ -293,6 +293,26 @@
"share": 1,
"submit": 0,
"write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 0,
+ "role": "Education Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
}
],
"quick_entry": 1,
diff --git a/erpnext/education/utils.py b/erpnext/education/utils.py
index 2ca46d5..1b93c9d 100644
--- a/erpnext/education/utils.py
+++ b/erpnext/education/utils.py
@@ -32,7 +32,7 @@
(to_time > %(from_time)s and to_time < %(to_time)s) or
(%(from_time)s > from_time and %(from_time)s < to_time) or
(%(from_time)s = from_time and %(to_time)s = to_time))
- and name!=%(name)s""".format(doctype, fieldname),
+ and name!=%(name)s and docstatus!=2""".format(doctype, fieldname),
{
"schedule_date": doc.schedule_date,
"val": value or doc.get(fieldname),
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index b4afea7..65953ec 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -41,7 +41,7 @@
on_session_creation = "erpnext.shopping_cart.utils.set_cart_count"
on_logout = "erpnext.shopping_cart.utils.clear_cart_count"
-treeviews = ['Account', 'Cost Center', 'Warehouse', 'Item Group', 'Customer Group', 'Sales Person', 'Territory']
+treeviews = ['Account', 'Cost Center', 'Warehouse', 'Item Group', 'Customer Group', 'Sales Person', 'Territory', 'Assessment Group']
# website
update_website_context = "erpnext.shopping_cart.utils.update_website_context"
@@ -49,7 +49,7 @@
email_append_to = ["Job Applicant", "Lead", "Opportunity", "Issue"]
-calendars = ["Task", "Production Order", "Leave Application", "Sales Order", "Holiday List"]
+calendars = ["Task", "Production Order", "Leave Application", "Sales Order", "Holiday List", "Course Schedule"]