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

patches/october_2012/custom_script_delete_permission.py

@@ -0,0 +1,9 @@
+import webnotes
+def execute():
+	webnotes.conn.sql("""delete from `tabDocPerm` where parent='Custom Script'""")
+	webnotes.conn.commit()
+	
+	from webnotes.model.sync import sync
+	sync("core", "custom_script", force=1)
+		
+	webnotes.conn.begin()

patches/patch_list.py

@@ -639,4 +639,8 @@ patch_list = [
 		'patch_module': 'patches.october_2012',
 		'patch_file': 'fix_cancelled_gl_entries',
 	},
+	{
+		'patch_module': 'patches.october_2012',
+		'patch_file': 'custom_script_delete_permission',
+	}
 ]