nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 18:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fleet-moved-to-hr

Browse Source
This commit is contained in:
Nabin Hait
2017-01-17 11:05:39 +05:30
committed by GitHub
parent f80c2b9606 03f82240fa
commit b064cf39c2
65 changed files with 2965 additions and 915 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/config/desktop.py
View File

@@ -228,15 +228,6 @@ def get_data():
"_doctype": "Student Applicant",
"type": "list"
},
{
"module_name": "Assessment",
"color": "#8a70be",
"icon": "fa fa-file-text-alt",
"label": _("Assessment"),
"link": "List/Assessment",
"_doctype": "Assessment",
"type": "list"
},
{
"module_name": "Fees",
"color": "#83C21E",

16
erpnext/config/schools.py
View File

@@ -112,7 +112,7 @@ def get_data():
"items": [
{
"type": "doctype",
"name": "Assessment"
"name": "Assessment Plan"
},
{
"type": "doctype",
@@ -120,7 +120,19 @@ def get_data():
},
{
"type": "doctype",
"name": "Grading Structure"
"name": "Assessment Result"
},
{
"type": "doctype",
"name": "Grading Scale"
},
{
"type": "doctype",
"name": "Evaluation Criteria"
},
{
"type": "doctype",
"name": "Assessment Result Tool"
}
]
},