From 5311e3898c91826aae3952a054a9b9722b3cdb97 Mon Sep 17 00:00:00 2001
From: scmmishra <scm.mymail@gmail.com>
Date: Mon, 15 Oct 2018 16:04:25 +0530
Subject: [PATCH] General Changes

---
 erpnext/config/education.py                    | 17 +++++++++++++++++
 erpnext/education/doctype/content/content.json |  7 ++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/erpnext/config/education.py b/erpnext/config/education.py
index b845537b06..2553c265be 100644
--- a/erpnext/config/education.py
+++ b/erpnext/config/education.py
@@ -195,6 +195,10 @@ def get_data():
 					"type": "doctype",
 					"name": "Content"
 				},
+				{
+					"type": "doctype",
+					"name": "Question"
+				},
 				{
 					"type": "doctype",
 					"name": "Instructor"
@@ -205,6 +209,19 @@ def get_data():
 				}
 			]
 		},
+		{
+			"label": _("LMS Activity"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Course Enrollment"
+				},
+				{
+					"type": "doctype",
+					"name": "Course Activity"
+				}
+			]
+		},
 		{
 			"label": _("Settings"),
 			"items": [
diff --git a/erpnext/education/doctype/content/content.json b/erpnext/education/doctype/content/content.json
index 35db445af0..1d3221f3bb 100644
--- a/erpnext/education/doctype/content/content.json
+++ b/erpnext/education/doctype/content/content.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_events_in_timeline": 0, 
  "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
@@ -249,7 +250,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "quiz", 
+   "fieldname": "questions", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -261,7 +262,7 @@
    "label": "Questions", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Question", 
+   "options": "Content Question", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -480,7 +481,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-10-08 14:15:06.001140", 
+ "modified": "2018-10-15 14:36:42.894519", 
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Content",