From 11900e8fad0bd10f14611689ebce3b1cc79dc7f8 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 22 Jul 2016 10:58:56 +0530 Subject: [PATCH] [fix] make grid editable for schools and fix #5831 --- erpnext/config/desktop.py | 22 +++++++++--------- .../attendance_tool_student.json | 22 +++++++++++++++--- .../examination_result.json | 23 +++++++++++++++++-- .../doctype/fee_amount/fee_amount.json | 6 ++--- .../program_course/program_course.json | 18 +++++++++++++-- .../program_enrollment_fee.json | 4 +++- .../program_enrollment_tool_student.json | 6 +++-- .../doctype/program_fee/program_fee.json | 3 ++- .../sg_creation_tool_course.json | 18 +++++++++++---- .../student_group_student.json | 20 ++++++++++++++-- 10 files changed, 111 insertions(+), 31 deletions(-) diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py index df2a0ee1f9..08f9d23af2 100644 --- a/erpnext/config/desktop.py +++ b/erpnext/config/desktop.py @@ -171,7 +171,7 @@ def get_data(): "icon": "octicon octicon-person", "label": _("Student"), "link": "List/Student", - "doctype": "Student", + "_doctype": "Student", "type": "list" }, { @@ -180,7 +180,7 @@ def get_data(): "icon": "octicon octicon-organization", "label": _("Student Group"), "link": "List/Student Group", - "doctype": "Student Group", + "_doctype": "Student Group", "type": "list" }, { @@ -189,7 +189,7 @@ def get_data(): "icon": "octicon octicon-calendar", "label": _("Course Schedule"), "link": "Calendar/Course Schedule", - "doctype": "Course Schedule", + "_doctype": "Course Schedule", "type": "list" }, { @@ -198,7 +198,7 @@ def get_data(): "icon": "octicon octicon-checklist", "label": _("Student Attendance"), "link": "List/Student Attendance", - "doctype": "Student Attendance", + "_doctype": "Student Attendance", "type": "list" }, { @@ -207,7 +207,7 @@ def get_data(): "icon": "octicon octicon-book", "label": _("Course"), "link": "List/Course", - "doctype": "Course", + "_doctype": "Course", "type": "list" }, { @@ -216,7 +216,7 @@ def get_data(): "icon": "octicon octicon-repo", "label": _("Program"), "link": "List/Program", - "doctype": "Program", + "_doctype": "Program", "type": "list" }, { @@ -225,7 +225,7 @@ def get_data(): "icon": "octicon octicon-clippy", "label": _("Student Applicant"), "link": "List/Student Applicant", - "doctype": "Student Applicant", + "_doctype": "Student Applicant", "type": "list" }, { @@ -234,7 +234,7 @@ def get_data(): "icon": "icon-file-text-alt", "label": _("Examination"), "link": "List/Examination", - "doctype": "Examination", + "_doctype": "Examination", "type": "list" }, { @@ -243,7 +243,7 @@ def get_data(): "icon": "icon-money", "label": _("Fees"), "link": "List/Fees", - "doctype": "Fees", + "_doctype": "Fees", "type": "list" }, { @@ -252,7 +252,7 @@ def get_data(): "icon": "octicon octicon-broadcast", "label": _("Instructor"), "link": "List/Instructor", - "doctype": "Instructor", + "_doctype": "Instructor", "type": "list" }, { @@ -261,7 +261,7 @@ def get_data(): "icon": "icon-map-marker", "label": _("Room"), "link": "List/Room", - "doctype": "Examination", + "_doctype": "Examination", "type": "list" }, { diff --git a/erpnext/schools/doctype/attendance_tool_student/attendance_tool_student.json b/erpnext/schools/doctype/attendance_tool_student/attendance_tool_student.json index 47a71f053e..731de83cda 100644 --- a/erpnext/schools/doctype/attendance_tool_student/attendance_tool_student.json +++ b/erpnext/schools/doctype/attendance_tool_student/attendance_tool_student.json @@ -2,11 +2,13 @@ "allow_copy": 0, "allow_import": 0, "allow_rename": 0, + "beta": 0, "creation": "2015-11-10 16:28:51.366668", "custom": 0, "docstatus": 0, "doctype": "DocType", "document_type": "", + "editable_grid": 1, "fields": [ { "allow_on_submit": 0, @@ -16,14 +18,17 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Student", + "length": 0, "no_copy": 0, "options": "Student", "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -39,13 +44,16 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Student Name", + "length": 0, "no_copy": 0, "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -61,14 +69,17 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Status", + "length": 0, "no_copy": 0, "options": "Absent\nPresent\n", "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -79,20 +90,25 @@ ], "hide_heading": 0, "hide_toolbar": 0, + "idx": 0, + "image_view": 0, "in_create": 0, "in_dialog": 0, "is_submittable": 0, - "issingle": 1, + "issingle": 0, "istable": 1, - "modified": "2016-07-18 10:30:50.243271", + "max_attachments": 0, + "modified": "2016-07-21 12:30:02.983801", "modified_by": "Administrator", "module": "Schools", "name": "Attendance Tool Student", "name_case": "", "owner": "Administrator", "permissions": [], + "quick_entry": 0, "read_only": 0, "read_only_onload": 0, "sort_field": "modified", - "sort_order": "DESC" + "sort_order": "DESC", + "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/schools/doctype/examination_result/examination_result.json b/erpnext/schools/doctype/examination_result/examination_result.json index 4758c297e4..932dff1d1c 100644 --- a/erpnext/schools/doctype/examination_result/examination_result.json +++ b/erpnext/schools/doctype/examination_result/examination_result.json @@ -2,11 +2,13 @@ "allow_copy": 0, "allow_import": 0, "allow_rename": 0, + "beta": 0, "creation": "2015-11-13 17:18:06.468332", "custom": 0, "docstatus": 0, "doctype": "DocType", "document_type": "", + "editable_grid": 1, "fields": [ { "allow_on_submit": 0, @@ -16,14 +18,17 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Student", + "length": 0, "no_copy": 0, "options": "Student", "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -39,13 +44,16 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Student Name", + "length": 0, "no_copy": 0, "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -61,12 +69,15 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "length": 0, "no_copy": 0, "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -82,13 +93,16 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Result", + "length": 0, "no_copy": 0, "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -99,20 +113,25 @@ ], "hide_heading": 0, "hide_toolbar": 0, + "idx": 0, + "image_view": 0, "in_create": 0, "in_dialog": 0, "is_submittable": 0, "issingle": 0, "istable": 1, - "modified": "2016-07-18 10:30:50.243271", + "max_attachments": 0, + "modified": "2016-07-21 12:27:02.405667", "modified_by": "Administrator", "module": "Schools", "name": "Examination Result", "name_case": "", "owner": "Administrator", "permissions": [], + "quick_entry": 0, "read_only": 0, "read_only_onload": 0, "sort_field": "modified", - "sort_order": "DESC" + "sort_order": "DESC", + "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/schools/doctype/fee_amount/fee_amount.json b/erpnext/schools/doctype/fee_amount/fee_amount.json index d7156cba80..942b6efb4c 100644 --- a/erpnext/schools/doctype/fee_amount/fee_amount.json +++ b/erpnext/schools/doctype/fee_amount/fee_amount.json @@ -9,7 +9,7 @@ "docstatus": 0, "doctype": "DocType", "document_type": "Setup", - "editable_grid": 0, + "editable_grid": 1, "fields": [ { "allow_on_submit": 0, @@ -104,8 +104,8 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-18 10:30:50.243271", - "modified_by": "Administrator", + "modified": "2016-07-21 12:25:44.368245", + "modified_by": "r@r.com", "module": "Schools", "name": "Fee Amount", "name_case": "", diff --git a/erpnext/schools/doctype/program_course/program_course.json b/erpnext/schools/doctype/program_course/program_course.json index 81aad68d0d..e9a397ee56 100644 --- a/erpnext/schools/doctype/program_course/program_course.json +++ b/erpnext/schools/doctype/program_course/program_course.json @@ -2,11 +2,13 @@ "allow_copy": 0, "allow_import": 0, "allow_rename": 0, + "beta": 0, "creation": "2015-09-07 14:37:01.886859", "custom": 0, "docstatus": 0, "doctype": "DocType", "document_type": "", + "editable_grid": 1, "fields": [ { "allow_on_submit": 0, @@ -16,6 +18,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Course", @@ -25,6 +28,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -40,6 +44,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Academic Term", @@ -49,6 +54,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -64,6 +70,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -71,6 +78,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -86,6 +94,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Course Code", @@ -94,6 +103,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -109,6 +119,7 @@ "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Required", @@ -117,6 +128,7 @@ "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -128,6 +140,7 @@ "hide_heading": 0, "hide_toolbar": 0, "idx": 0, + "image_view": 0, "in_create": 0, "in_dialog": 0, "is_submittable": 0, @@ -135,16 +148,17 @@ "istable": 1, "max_attachments": 0, "menu_index": 0, - "modified": "2016-07-18 10:30:50.243271", + "modified": "2016-07-21 12:27:02.330118", "modified_by": "Administrator", "module": "Schools", "name": "Program Course", "name_case": "", "owner": "Administrator", "permissions": [], + "quick_entry": 0, "read_only": 0, "read_only_onload": 0, "sort_field": "modified", "sort_order": "DESC", - "version": 0 + "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.json b/erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.json index 3ed340d441..6760384bf4 100644 --- a/erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.json +++ b/erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.json @@ -8,6 +8,7 @@ "docstatus": 0, "doctype": "DocType", "document_type": "", + "editable_grid": 1, "fields": [ { "allow_on_submit": 0, @@ -139,13 +140,14 @@ "hide_heading": 0, "hide_toolbar": 0, "idx": 0, + "image_view": 0, "in_create": 0, "in_dialog": 0, "is_submittable": 0, "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-18 10:30:50.243271", + "modified": "2016-07-21 12:27:02.547926", "modified_by": "Administrator", "module": "Schools", "name": "Program Enrollment Fee", diff --git a/erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json b/erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json index a72feb4043..9e200d762f 100644 --- a/erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json +++ b/erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json @@ -8,6 +8,7 @@ "docstatus": 0, "doctype": "DocType", "document_type": "", + "editable_grid": 1, "fields": [ { "allow_on_submit": 0, @@ -116,14 +117,15 @@ "hide_heading": 0, "hide_toolbar": 0, "idx": 0, + "image_view": 0, "in_create": 0, "in_dialog": 0, "is_submittable": 0, "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-18 10:30:50.243271", - "modified_by": "Administrator", + "modified": "2016-07-21 12:32:12.784608", + "modified_by": "r@r.com", "module": "Schools", "name": "Program Enrollment Tool Student", "name_case": "", diff --git a/erpnext/schools/doctype/program_fee/program_fee.json b/erpnext/schools/doctype/program_fee/program_fee.json index ef3b9a6547..6b320a0569 100644 --- a/erpnext/schools/doctype/program_fee/program_fee.json +++ b/erpnext/schools/doctype/program_fee/program_fee.json @@ -8,6 +8,7 @@ "docstatus": 0, "doctype": "DocType", "document_type": "", + "editable_grid": 1, "fields": [ { "allow_on_submit": 0, @@ -146,7 +147,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-18 10:30:50.243271", + "modified": "2016-07-21 12:27:02.153696", "modified_by": "Administrator", "module": "Schools", "name": "Program Fee", diff --git a/erpnext/schools/doctype/sg_creation_tool_course/sg_creation_tool_course.json b/erpnext/schools/doctype/sg_creation_tool_course/sg_creation_tool_course.json index 872b1dc3bc..8814f883af 100644 --- a/erpnext/schools/doctype/sg_creation_tool_course/sg_creation_tool_course.json +++ b/erpnext/schools/doctype/sg_creation_tool_course/sg_creation_tool_course.json @@ -2,11 +2,13 @@ "allow_copy": 0, "allow_import": 0, "allow_rename": 0, + "beta": 0, "creation": "2016-01-04 15:03:57.940079", "custom": 0, "docstatus": 0, "doctype": "DocType", "document_type": "", + "editable_grid": 1, "fields": [ { "allow_on_submit": 0, @@ -16,6 +18,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Course", @@ -41,6 +44,7 @@ "fieldtype": "Read Only", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Course Code", @@ -66,6 +70,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -89,6 +94,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Student Group Name", @@ -113,6 +119,7 @@ "fieldtype": "Int", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Max Strength", @@ -133,21 +140,24 @@ "hide_heading": 0, "hide_toolbar": 0, "idx": 0, + "image_view": 0, "in_create": 0, "in_dialog": 0, "is_submittable": 0, - "issingle": 1, + "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-18 10:30:50.243271", - "modified_by": "Administrator", + "modified": "2016-07-21 12:31:41.252860", + "modified_by": "r@r.com", "module": "Schools", "name": "SG Creation Tool Course", "name_case": "", "owner": "Administrator", "permissions": [], + "quick_entry": 0, "read_only": 0, "read_only_onload": 0, "sort_field": "modified", - "sort_order": "DESC" + "sort_order": "DESC", + "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/schools/doctype/student_group_student/student_group_student.json b/erpnext/schools/doctype/student_group_student/student_group_student.json index 1d8a9bb013..94493aef84 100644 --- a/erpnext/schools/doctype/student_group_student/student_group_student.json +++ b/erpnext/schools/doctype/student_group_student/student_group_student.json @@ -2,11 +2,13 @@ "allow_copy": 0, "allow_import": 0, "allow_rename": 0, + "beta": 0, "creation": "2015-09-11 15:14:58.501830", "custom": 0, "docstatus": 0, "doctype": "DocType", "document_type": "", + "editable_grid": 1, "fields": [ { "allow_on_submit": 0, @@ -16,14 +18,17 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Student", + "length": 0, "no_copy": 0, "options": "Student", "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -39,12 +44,15 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "length": 0, "no_copy": 0, "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -60,13 +68,16 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Student Name", + "length": 0, "no_copy": 0, "permlevel": 0, "precision": "", "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -77,20 +88,25 @@ ], "hide_heading": 0, "hide_toolbar": 0, + "idx": 0, + "image_view": 0, "in_create": 0, "in_dialog": 0, "is_submittable": 0, "issingle": 0, "istable": 1, - "modified": "2016-07-18 10:30:50.243271", + "max_attachments": 0, + "modified": "2016-07-21 12:27:02.479077", "modified_by": "Administrator", "module": "Schools", "name": "Student Group Student", "name_case": "", "owner": "Administrator", "permissions": [], + "quick_entry": 0, "read_only": 0, "read_only_onload": 0, "sort_field": "modified", - "sort_order": "DESC" + "sort_order": "DESC", + "track_seen": 0 } \ No newline at end of file