Merge branch 'develop'

frappe/__version__.py

 from __future__ import unicode_literals
-__version__ = "6.12.0"
+__version__ = "6.12.1"

frappe/commands.py

@@ -404,19 +404,43 @@ def write_docs(context, app, target, local=False):
 @click.argument('docs_version')
 @click.argument('target')
 @click.option('--local', default=False, is_flag=True, help='Run app locally')
-def build_docs(context, app, docs_version, target, local=False):
+@click.option('--watch', default=False, is_flag=True, help='Watch for changes and rewrite')
+def build_docs(context, app, docs_version, target, local=False, watch=False):
 	"Setup docs in target folder of target app"
-	from frappe.utils.setup_docs import setup_docs
+	from frappe.utils import watch
 	for site in context.sites:
-		try:
-			frappe.init(site=site)
-			frappe.connect()
-			make = setup_docs(app)
+		_build_docs_once(site, app, docs_version, target, local)
+
+		if watch:
+			def trigger_make(source_path, event_type):
+				if "/templates/autodoc/" in source_path:
+					_build_docs_once(site, app, docs_version, target, local)
+
+				elif ("/docs.css" in source_path
+					or "/docs/" in source_path
+					or "docs.py" in source_path):
+					_build_docs_once(site, app, docs_version, target, local, only_content_updated=True)
+
+			apps_path = frappe.get_app_path("frappe", "..", "..")
+			watch(apps_path, handler=trigger_make)
+
+def _build_docs_once(site, app, docs_version, target, local, only_content_updated=False):
+	from frappe.utils.setup_docs import setup_docs
+
+	try:
+
+		frappe.init(site=site)
+		frappe.connect()
+		make = setup_docs(app)
+
+		if not only_content_updated:
 			make.build(docs_version)
 			make.sync_docs()
-			make.make_docs(target, local)
-		finally:
-			frappe.destroy()
+
+		make.make_docs(target, local)
+
+	finally:
+		frappe.destroy()
 
 
 @click.command('reset-perms')

frappe/config/core.py

+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+	return [
+		{
+			"label": _("Documents"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "DocType",
+					"description": _("Models (building blocks) of the Application"),
+				},
+				{
+					"type": "doctype",
+					"name": "Module Def",
+					"description": _("Groups of DocTypes"),
+				},
+				{
+					"type": "doctype",
+					"name": "Page",
+					"description": _("Pages in Desk (place holders)"),
+				},
+				{
+					"type": "doctype",
+					"name": "Report",
+					"description": _("Script or Query reports"),
+				},
+				{
+					"type": "doctype",
+					"name": "Print Format",
+					"description": _("Customized Formats for Printing, Email"),
+				},
+				{
+					"type": "doctype",
+					"name": "Custom Script",
+					"description": _("Client side script extensions in Javascript"),
+				}
+			]
+		},
+		{
+			"label": _("Logs"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Scheduler Log",
+					"description": _("Errors in Background Events"),
+				},
+				{
+					"type": "doctype",
+					"name": "Bulk Email",
+					"description": _("Background Email Queue"),
+				}
+			]
+		}
+	]

frappe/config/desktop.py

@@ -23,9 +23,10 @@ def get_data():
 			"type": "module"
 		},
 		"Core": {
+			"label": _("Developer"),
 			"color": "#589494",
 			"icon": "icon-cog",
-			"icon": "octicon octicon-file-binary",
+			"icon": "octicon octicon-circuit-board",
 			"type": "module",
 			"system_manager": 1
 		},
@@ -34,7 +35,6 @@ def get_data():
 			"color": "#FFF5A7",
 			"reverse": 1,
 			"icon": "octicon octicon-calendar",
-			"type": "module",
-			"system_manager": 1
+			"type": "module"
 		}
 	}

frappe/config/docs.py

@@ -21,5 +21,12 @@ Frappe Framework was designed to build [ERPNext](https://erpnext.com), open sour
 ERP for managing small and medium sized businesses.
 """
 
+style = """
+.splash .jumbotron h1 {
+	font-weight: 200;
+	font-size: 48px;
+}
+"""
+
 def get_context(context):
 	pass

frappe/docs/current/api/config/frappe.config.desk.html

 <!-- title: frappe.config.desk --><div class="dev-header">
 
 <a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.10.1</a>
+	Version 6.11.0</a>
 
 
 	<a class="btn btn-default btn-sm" href="https://github.com/frappe/frappe/blob/develop/frappe/config/desk.py"

frappe/docs/current/api/config/frappe.config.desktop.html

 <!-- title: frappe.config.desktop --><div class="dev-header">
 
 <a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.10.1</a>
+	Version 6.11.0</a>
 
 
 	<a class="btn btn-default btn-sm" href="https://github.com/frappe/frappe/blob/develop/frappe/config/desktop.py"

frappe/docs/current/api/config/frappe.config.docs.html

 <!-- title: frappe.config.docs --><div class="dev-header">
 
 <a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.10.1</a>
+	Version 6.11.0</a>
 
 
 	<a class="btn btn-default btn-sm" href="https://github.com/frappe/frappe/blob/develop/frappe/config/docs.py"

frappe/docs/current/api/config/frappe.config.html

 <!-- title: frappe.config --><div class="dev-header">
 
 <a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.10.1</a>
+	Version 6.11.0</a>
 
 
 	<a class="btn btn-default btn-sm" href="https://github.com/frappe/frappe/blob/develop/frappe/config.py"

frappe/docs/current/api/config/frappe.config.setup.html

 <!-- title: frappe.config.setup --><div class="dev-header">
 
 <a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.10.1</a>
+	Version 6.11.0</a>
 
 
 	<a class="btn btn-default btn-sm" href="https://github.com/frappe/frappe/blob/develop/frappe/config/setup.py"

frappe/docs/current/api/config/frappe.config.website.html

 <!-- title: frappe.config.website --><div class="dev-header">
 
 <a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.10.1</a>
+	Version 6.11.0</a>
 
 
 	<a class="btn btn-default btn-sm" href="https://github.com/frappe/frappe/blob/develop/frappe/config/website.py"

frappe/docs/current/api/config/index.html

@@ -4,7 +4,7 @@
 <div class="dev-header">
 
 <a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.10.1</a>
+	Version 6.11.0</a>
 
 
 	<a class="btn btn-default btn-sm" href="https://github.com/frappe/frappe/tree/develop/config"

frappe/docs/current/api/core/frappe.core.html

 <!-- title: frappe.core --><div class="dev-header">
 
 <a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.10.1</a>
+	Version 6.11.0</a>
 
 
 	<a class="btn btn-default btn-sm" href="https://github.com/frappe/frappe/blob/develop/frappe/core.py"

frappe/docs/current/api/core/frappe.core.notifications.html

 <!-- title: frappe.core.notifications --><div class="dev-header">
 
 <a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.10.1</a>
+	Version 6.11.0</a>
 
 
 	<a class="btn btn-default btn-sm" href="https://github.com/frappe/frappe/blob/develop/frappe/core/notifications.py"

frappe/docs/current/api/core/index.html

@@ -4,7 +4,7 @@
 <div class="dev-header">
 
 <a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.10.1</a>
+	Version 6.11.0</a>
 
 
 	<a class="btn btn-default btn-sm" href="https://github.com/frappe/frappe/tree/develop/core"

frappe/docs/current/api/custom/frappe.custom.html

 <!-- title: frappe.custom --><div class="dev-header">
 
 <a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.10.1</a>
+	Version 6.11.0</a>
 
 
 	<a class="btn btn-default btn-sm" href="https://github.com/frappe/frappe/blob/develop/frappe/custom.py"

frappe/docs/current/api/custom/index.html

@@ -4,7 +4,7 @@
 <div class="dev-header">
 
 <a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.10.1</a>
+	Version 6.11.0</a>
 
 
 	<a class="btn btn-default btn-sm" href="https://github.com/frappe/frappe/tree/develop/custom"

frappe/docs/current/api/desk/form/frappe.desk.form.assign_to.html

 <!-- title: frappe.desk.form.assign_to --><div class="dev-header">
 
 <a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.10.1</a>
+	Version 6.11.0</a>
 
 
 	<a class="btn btn-default btn-sm" href="https://github.com/frappe/frappe/blob/develop/frappe/desk/form/assign_to.py"

frappe/docs/current/api/desk/form/frappe.desk.form.html

 <!-- title: frappe.desk.form --><div class="dev-header">
 
 <a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.10.1</a>
+	Version 6.11.0</a>
 
 
 	<a class="btn btn-default btn-sm" href="https://github.com/frappe/frappe/blob/develop/frappe/desk/form.py"

frappe/docs/current/api/desk/form/frappe.desk.form.linked_with.html

 <!-- title: frappe.desk.form.linked_with --><div class="dev-header">
 
 <a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.10.1</a>
+	Version 6.11.0</a>
 
 
 	<a class="btn btn-default btn-sm" href="https://github.com/frappe/frappe/blob/develop/frappe/desk/form/linked_with.py"