diff --git a/addons/document/document.py b/addons/document/document.py
index f6cbddebae7..2b2ac2f7587 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -73,7 +73,7 @@ class document_file(osv.osv):
 
     _columns = {
         'user_id': fields.many2one('res.users', 'Owner', select=1),
-        'group_ids': fields.many2many('res.groups', 'document_directory_group_rel', 'item_id', 'group_id', 'Groups'),
+        'group_ids': fields.many2many('res.groups', 'document_group_rel', 'item_id', 'group_id', 'Groups'),
         # the directory id now is mandatory. It can still be computed automatically.
         'parent_id': fields.many2one('document.directory', 'Directory', select=1, required=True),
         'file_size': fields.integer('File Size', required=True),
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index bea11d6d12e..421c423b900 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -103,7 +103,7 @@ class document_storage(osv.osv):
         'create_date': fields.datetime('Date Created', readonly=True),
         'create_uid':  fields.many2one('res.users', 'Creator', readonly=True),
         'user_id': fields.many2one('res.users', 'Owner'),
-        'group_ids': fields.many2many('res.groups', 'document_directory_group_rel', 'item_id', 'group_id', 'Groups'),
+        'group_ids': fields.many2many('res.groups', 'document_storage_group_rel', 'item_id', 'group_id', 'Groups'),
         'dir_ids': fields.one2many('document.directory', 'parent_id', 'Directories'),
         'type': fields.selection([('db', 'Database'), ('filestore', 'Internal File storage'),
             ('realstore', 'External file storage'), ('virtual', 'Virtual storage')], 'Type', required=True),
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 252b9b36a26..cab0fb7ac78 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -77,7 +77,7 @@
                 </page>
                 <page string="Generated Files">
                     <label colspan="4" string="For each entry here, virtual files will appear in this folder." />
-                    <field name="content_ids" nolabel="1" colspan="4">
+					<field name="content_ids" nolabel="1" colspan="4" attrs="{'readonly': [('ressource_type_id','=',False)]}">
                         <form string="Contents">
                             <field name="name"/>
                             <field name="sequence"/>