From e92a740b535149e83fe907a5a1b6abf5abe659c4 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 3 Feb 2017 16:05:53 +0530 Subject: [PATCH] [minor] school patch fix --- .../v7_2/rename_evaluation_criteria.py | 37 +++++++++++-------- erpnext/schools/doctype/student/student.json | 32 +--------------- .../doctype/student_batch/student_batch.json | 21 +++-------- .../student_batch_student.json | 8 +--- 4 files changed, 30 insertions(+), 68 deletions(-) diff --git a/erpnext/patches/v7_2/rename_evaluation_criteria.py b/erpnext/patches/v7_2/rename_evaluation_criteria.py index 4239232a6a..a45604fd81 100644 --- a/erpnext/patches/v7_2/rename_evaluation_criteria.py +++ b/erpnext/patches/v7_2/rename_evaluation_criteria.py @@ -2,23 +2,28 @@ import frappe from frappe.model.utils.rename_field import rename_field def execute(): - frappe.rename_doc("DocType", "Evaluation Criteria", "Assessment Criteria", force=True) - frappe.reload_doc("schools", "doctype", "assessment_criteria") - rename_field("Assessment Criteria", "evaluation_criteria", "assessment_criteria") + frappe.rename_doc("DocType", "Evaluation Criteria", "Assessment Criteria", force=True) + frappe.reload_doc("schools", "doctype", "assessment_criteria") + if 'evaluation_criteria' in frappe.db.get_table_columns('Assessment Criteria'): + rename_field("Assessment Criteria", "evaluation_criteria", "assessment_criteria") - frappe.rename_doc("DocType", "Assessment Evaluation Criteria", "Assessment Plan Criteria", force=True) - frappe.reload_doc("schools", "doctype", "assessment_plan_criteria") - rename_field("Assessment Plan Criteria", "evaluation_criteria", "assessment_criteria") + frappe.rename_doc("DocType", "Assessment Evaluation Criteria", "Assessment Plan Criteria", force=True) + frappe.reload_doc("schools", "doctype", "assessment_plan_criteria") + if 'evaluation_criteria' in frappe.db.get_table_columns('Assessment Plan'): + rename_field("Assessment Plan Criteria", "evaluation_criteria", "assessment_criteria") - frappe.reload_doc("schools", "doctype", "assessment_plan") - rename_field("Assessment Plan", "evaluation_criterias", "assessment_criteria") - - frappe.reload_doc("schools", "doctype", "assessment_result_detail") - rename_field("Assessment Result Detail", "evaluation_criteria", "assessment_criteria") + frappe.reload_doc("schools", "doctype", "assessment_plan") + rename_field("Assessment Plan", "evaluation_criterias", "assessment_criteria") - frappe.rename_doc("DocType", "Course Evaluation Criteria", "Course Assessment Criteria", force=True) - frappe.reload_doc("schools", "doctype", "course_assessment_criteria") - rename_field("Course Assessment Criteria", "evaluation_criteria", "assessment_criteria") + frappe.reload_doc("schools", "doctype", "assessment_result_detail") + if 'evaluation_criteria' in frappe.db.get_table_columns('Assessment Result Detail'): + rename_field("Assessment Result Detail", "evaluation_criteria", "assessment_criteria") - frappe.reload_doc("schools", "doctype", "course") - rename_field("Course", "evaluation_criterias", "assessment_criteria") + frappe.rename_doc("DocType", "Course Evaluation Criteria", "Course Assessment Criteria", force=True) + frappe.reload_doc("schools", "doctype", "course_assessment_criteria") + if 'evaluation_criteria' in frappe.db.get_table_columns('Course Assessment Criteria'): + rename_field("Course Assessment Criteria", "evaluation_criteria", "assessment_criteria") + + frappe.reload_doc("schools", "doctype", "course") + if 'evaluation_criteria' in frappe.db.get_table_columns('Course'): + rename_field("Course", "evaluation_criterias", "assessment_criteria") diff --git a/erpnext/schools/doctype/student/student.json b/erpnext/schools/doctype/student/student.json index 50efdc1772..9595dfa62d 100644 --- a/erpnext/schools/doctype/student/student.json +++ b/erpnext/schools/doctype/student/student.json @@ -22,7 +22,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "First Name", @@ -50,7 +49,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Middle Name", @@ -78,7 +76,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Last Name", @@ -106,7 +103,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "length": 0, @@ -133,7 +129,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Naming Series", @@ -162,7 +157,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Student Email Address", @@ -190,7 +184,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Student Mobile Number", @@ -220,7 +213,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 1, "in_standard_filter": 0, "label": "Joining Date", @@ -248,7 +240,6 @@ "hidden": 1, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Image", @@ -278,7 +269,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Personal Details", @@ -306,7 +296,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Date of Birth", @@ -334,7 +323,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Blood Group", @@ -363,7 +351,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "length": 0, @@ -390,7 +377,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Gender", @@ -419,7 +405,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Nationality", @@ -448,7 +433,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Student Applicant", @@ -477,7 +461,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Guardian Details", @@ -505,7 +488,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Guardians", @@ -534,7 +516,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Home Address", @@ -562,7 +543,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Address Line 1", @@ -590,7 +570,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Address Line 2", @@ -618,7 +597,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Pincode", @@ -646,7 +624,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "length": 0, @@ -673,7 +650,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "City", @@ -701,7 +677,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "State", @@ -729,7 +704,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Sibling Details", @@ -758,7 +732,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Siblings", @@ -788,7 +761,6 @@ "hidden": 1, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Title", @@ -819,7 +791,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-01-27 13:19:55.693540", + "modified": "2017-02-03 05:07:48.915706", "modified_by": "Administrator", "module": "Schools", "name": "Student", @@ -855,7 +827,7 @@ "email": 1, "export": 1, "if_owner": 0, - "import": 0, + "import": 1, "permlevel": 0, "print": 1, "read": 1, diff --git a/erpnext/schools/doctype/student_batch/student_batch.json b/erpnext/schools/doctype/student_batch/student_batch.json index f571d9d5a6..4909ff04ab 100644 --- a/erpnext/schools/doctype/student_batch/student_batch.json +++ b/erpnext/schools/doctype/student_batch/student_batch.json @@ -1,7 +1,7 @@ { "allow_copy": 0, - "allow_import": 0, - "allow_rename": 0, + "allow_import": 1, + "allow_rename": 1, "autoname": "", "beta": 0, "creation": "2016-07-21 15:49:53.776461", @@ -22,7 +22,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Student Batch Name", @@ -51,7 +50,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 1, "label": "Academic Year", @@ -81,7 +79,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Active", @@ -109,7 +106,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "length": 0, @@ -136,7 +132,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 1, "label": "Program", @@ -165,7 +160,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 1, "label": "Academic Term", @@ -194,7 +188,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Students", @@ -222,7 +215,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Students", @@ -251,7 +243,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Instructors", @@ -279,7 +270,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Instructors", @@ -309,7 +299,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-12-01 13:18:12.024001", + "modified": "2017-02-03 05:19:35.037148", "modified_by": "Administrator", "module": "Schools", "name": "Student Batch", @@ -325,8 +315,7 @@ "email": 1, "export": 1, "if_owner": 0, - "import": 0, - "is_custom": 0, + "import": 1, "permlevel": 0, "print": 1, "read": 1, @@ -347,7 +336,6 @@ "export": 0, "if_owner": 0, "import": 0, - "is_custom": 0, "permlevel": 0, "print": 0, "read": 1, @@ -365,5 +353,6 @@ "sort_field": "modified", "sort_order": "DESC", "title_field": "", + "track_changes": 0, "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/schools/doctype/student_batch_student/student_batch_student.json b/erpnext/schools/doctype/student_batch_student/student_batch_student.json index 558281bd2b..3558cc8528 100644 --- a/erpnext/schools/doctype/student_batch_student/student_batch_student.json +++ b/erpnext/schools/doctype/student_batch_student/student_batch_student.json @@ -20,7 +20,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 1, "in_standard_filter": 0, "label": "Student", @@ -49,7 +48,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 0, "in_standard_filter": 0, "length": 0, @@ -76,13 +74,12 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 1, "in_standard_filter": 0, "label": "Student Name", "length": 0, "no_copy": 0, - "options": "", + "options": "student.title", "permlevel": 0, "precision": "", "print_hide": 0, @@ -106,7 +103,6 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, "in_list_view": 1, "in_standard_filter": 0, "label": "Active", @@ -135,7 +131,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-01-27 14:47:21.125366", + "modified": "2017-02-03 05:26:35.518004", "modified_by": "Administrator", "module": "Schools", "name": "Student Batch Student",