Merge branch11 into patch18

Branch patch11 had somewhere been lost in bzr hell.

Conflicts:
	account/account_move_line.py
	document_webdav/nodes.py
	document_webdav/webdav_server.py
	event_project/__init__.py
	users_ldap/users_ldap.py

bzr revid: p_christ@hol.gr-20101223155444-ym8r0g4208gm88j9

1 files changed, 9 insertions, 0 deletions

diff --git a/addons/document/document.py b/addons/document/document.py
index dd34dd4295c..79fb83b5b1f 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -165,6 +165,15 @@ class document_file(osv.osv):
                 return False
         return True
 
+    def check(self, cr, uid, ids, mode, context=None, values=None):
+        """Check access wrt. res_model, relax the rule of ir.attachment parent
+        
+        With 'document' installed, everybody will have access to attachments of
+        any resources they can *read*.
+        """
+        return super(document_file, self).check(cr, uid, ids, mode='read',
+                                            context=context, values=values)
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}