Merge branch 'master' of github.com:webnotes/erpnext

erpnext/patches/reload_doclayer.py

@@ -7,3 +7,10 @@ def execute():
 	reload_doc('core', 'doctype', 'doclayer')
 	reload_doc('core', 'doctype', 'doclayerfield')
 	reload_doc('accounts', 'doctype', 'gl_entry')
+	from webnotes.model.doc import Document
+	d = Document('DocType Label')
+	d.dt = "DocLayer"
+	d.dt_label = "Customize Form View"
+	d.save(1)
+	from webnotes.session_cache import clear
+	clear()

index.html

@@ -3,7 +3,7 @@
 	<meta charset="utf-8">
 	<title>ERPNext</title>
 	<meta name="author" content="">
-	<script type="text/javascript">window._version_number="332"
+	<script type="text/javascript">window._version_number="336"
 
 wn={}
 wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}}