summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Lesuisse <al@openerp.com>2012-12-17 03:00:13 +0100
committerAntony Lesuisse <al@openerp.com>2012-12-17 03:00:13 +0100
commit25acb93277f1f38fa7d8db4493e42bc48bfde861 (patch)
tree2995aaaee00de369ffcfe811b623c487f889d783
parent45ce2234577fc5df16c25ebe45a9e4f5597f3213 (diff)
more fixes
bzr revid: al@openerp.com-20121217020013-b0buz0ilza9ole0a
-rw-r--r--addons/document/security/ir.model.access.csv3
-rw-r--r--addons/document/test/document_test.yml2
-rw-r--r--addons/document_webdav/nodes.py2
3 files changed, 2 insertions, 5 deletions
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
index a82b9acd838..e0513a0640c 100644
--- a/addons/document/security/ir.model.access.csv
+++ b/addons/document/security/ir.model.access.csv
@@ -6,9 +6,6 @@ access_document_directory_content_all,document.directory.content all,model_docum
access_document_directory_content_group_document_manager,document.directory.content document manager,model_document_directory_content,base.group_system,1,1,1,1
access_document_directory_content_type_group_document_manager,document.directory.content.type document manager,model_document_directory_content_type,base.group_system,1,1,1,1
access_document_directory_content_type_group_system,document.directory.content.type group system,model_document_directory_content_type,base.group_user,1,0,0,0
-access_document_storage_group_document_manager,document.storage document manager,model_document_storage,base.group_system,1,1,1,1
-access_document_storage_group_system,document.storage group system,model_document_storage,base.group_user,1,0,0,0
-access_document_storage_group_user,document.storage group user,model_document_storage,base.group_document_user,1,1,1,1
access_ir_attachment_group_user,ir.attachment user,base.model_ir_attachment,base.group_document_user,1,1,1,1
access_ir_attachment_group_system,ir.attachment system,base.model_ir_attachment,base.group_system,1,0,0,0
access_res_partner_group_user,res.partner user,base.model_res_partner,base.group_document_user,1,1,1,0
diff --git a/addons/document/test/document_test.yml b/addons/document/test/document_test.yml
index a6b938f0e69..75fa74548d0 100644
--- a/addons/document/test/document_test.yml
+++ b/addons/document/test/document_test.yml
@@ -17,7 +17,7 @@
id = self.write(cr, uid, [ref("dir_partner_label")], {'ressource_type_id' : ids[0]}, context)
-
In order to check static directory in OpenERP which is the real directory just like system's local folders,
- First I create a directory in OpenERP named "Directory 1" with storage as "Default File storage" and type as "Static Directory"
+ First I create a directory in OpenERP named "Directory 1" with type as "Static Directory"
-
!record {model: 'document.directory', id: directory_1}:
name : "Directory 1"
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index a8fedee4fe3..babe10a519e 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -20,7 +20,7 @@
##############################################################################
-from document import nodes
+from document import document as nodes
from tools.safe_eval import safe_eval as eval
import time
import urllib