Merge branch 'master' of github.com:webnotes/erpnext into dev
Conflicts:
erpnext/patches/patch_list.py
diff --git a/erpnext/patches/july_2012/remove_event_role_owner_match.py b/erpnext/patches/july_2012/remove_event_role_owner_match.py
new file mode 100644
index 0000000..a74ef80
--- /dev/null
+++ b/erpnext/patches/july_2012/remove_event_role_owner_match.py
@@ -0,0 +1,5 @@
+def execute():
+ import webnotes
+ webnotes.conn.sql("""\
+ update `tabDocPerm` set `match`=NULL
+ where parent='Event' and role='All' and permlevel=0""")
\ No newline at end of file
diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py
index 2392fd5..7debe8c 100644
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -500,4 +500,9 @@
'patch_file': 'auth_table',
'description': 'create new __Auth table'
},
+ {
+ 'patch_module': 'patches.july_2012',
+ 'patch_file': 'remove_event_role_owner_match',
+ 'description': "Remove Owner match from Event DocType's Permissions"
+ },
]
\ No newline at end of file
diff --git a/public/js/all-app.js b/public/js/all-app.js
index 436821c..a1ee500 100644
--- a/public/js/all-app.js
+++ b/public/js/all-app.js
@@ -1773,7 +1773,7 @@
wn.ui.toolbar.recent.add(this.doctype,this.docname,1);}
_f.Frm.prototype.check_doc_perm=function(){var dt=this.parent_doctype?this.parent_doctype:this.doctype;var dn=this.parent_docname?this.parent_docname:this.docname;this.perm=get_perm(dt,dn);this.orig_perm=get_perm(dt,dn,1);if(!this.perm[0][READ]){if(user=='Guest'){if(_f.temp_access[dt]&&_f.temp_access[dt][dn]){this.perm=[[1,0,0]]
return 1;}}
-window.back();return 0;}
+window.history.back();return 0;}
return 1}
_f.Frm.prototype.refresh=function(docname){if(docname){if(this.docname!=docname&&(!this.meta.in_dialog||this.in_form)&&!this.meta.istable)
scroll(0,0);this.docname=docname;}