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

Minor fixes for the Education domain (#11758)

Browse Source 
* add the new role Education Manager for education settings

* minor changes in the hooks for bootinfo

* Fix for amending the assessment plan
This commit is contained in:
Manas Solanki 2017-11-28 18:04:08 +05:30 committed by Nabin Hait
parent 7e07c150ed
commit 84e9d45055
4 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/education/doctype/assessment_plan/assessment_plan.json
View File

@ -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",

22
erpnext/education/doctype/education_settings/education_settings.json
View File

@ -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,

2
erpnext/education/utils.py
View File

@ -32,7 +32,7 @@ def get_overlap_for(doc, doctype, fieldname, value=None):
(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),

4
erpnext/hooks.py
View File

@ -41,7 +41,7 @@ update_and_get_user_progress = "erpnext.utilities.user_progress_utils.update_def
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 @@ my_account_context = "erpnext.shopping_cart.utils.update_my_account_context"
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"]