Merged introduction and eligibility into a single text field in Student Admission. (#6529)

erpnext/schools/doctype/student_admission/student_admission.json

@@ -351,32 +351,6 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "eligibility", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Eligibility", 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
   }
  ], 
  "hide_heading": 0, 
@@ -389,7 +363,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-09-15 07:03:55.581346", 
+ "modified": "2016-10-03 15:08:48.020111", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Admission", 

erpnext/templates/generators/student_admission.html

@@ -16,34 +16,6 @@
 <div>{{ introduction }}</div>
 {% endif %}
 
-{%- if eligibility -%}
-<h3> Eligibility </h3>
-<div>{{ eligibility }}</div>
-{% endif %}
-
-<table class="table table-bordered" style="margin-top: 20px; width: 30%">
-	<tr>
-		<th> Program</th>
-		<td>{{ program }} </td>
-	</tr>
-	<tr>
-		<th> Academic Year</th>
-		<td>{{ academic_year }} </td>
-	</tr>
-	<tr>
-		<th> Admission Start Date</th>
-		<td>{{ frappe.utils.formatdate(admission_start_date) }}</td>
-	</tr>
-	<tr>
-		<th> Admission End Date</th>
-		<td>{{ frappe.utils.formatdate(admission_end_date) }}</td>
-	</tr>
-	<tr>
-		<th> Application Fee</th>
-		<td>{{ frappe.utils.fmt_money(application_fee, 2, currency) }}</td>
-	</tr>
-</table>
-
 {%- if application_form_route -%}
 <p>
 	<a class='btn btn-primary'