[MERGE] branch merged with lp:openobject-addons

bzr revid: jap@tinyerp.com-20111221065553-k0h0ksnnr29mklna

11 files changed, 25 insertions, 8 deletions

diff --git a/addons/document_webdav/__init__.py b/addons/document_webdav/__init__.py
index ac417e18087..7cd1a38fc80 100644
--- a/addons/document_webdav/__init__.py
+++ b/addons/document_webdav/__init__.py
@@ -24,4 +24,5 @@ import webdav_server
 
 import document_webdav
 
-#eof
\ No newline at end of file
+#eof
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index 5576c17ba64..303f5c70e2c 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -72,3 +72,5 @@ which needs explicit configuration in openerp-server.conf, too.
         "certificate" : "001236490750845657973",
         'images': ['images/dav_properties.jpeg','images/directories_structure_principals.jpeg'],
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/cache.py b/addons/document_webdav/cache.py
index 7f03aa6da13..95ff9d31f62 100644
--- a/addons/document_webdav/cache.py
+++ b/addons/document_webdav/cache.py
@@ -37,3 +37,5 @@ def memoize(maxsize):
         return wrapper 
     return decorating_function
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index c167d90ba42..772b7600f20 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -1023,3 +1023,5 @@ class openerp_dav_handler(dav_interface):
             if cr: cr.close()
 
 #eof
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/document_webdav.py b/addons/document_webdav/document_webdav.py
index f5fa7b591d8..da463c9eb1b 100644
--- a/addons/document_webdav/document_webdav.py
+++ b/addons/document_webdav/document_webdav.py
@@ -127,4 +127,5 @@ class dav_file_property(osv.osv):
         
 dav_file_property()
 
-#eof
\ No newline at end of file
+#eof
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index 5927eade899..d6ceca458cd 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -400,3 +400,5 @@ node_descriptor = nodes.node_descriptor
 
 
 #eof
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/redirect.py b/addons/document_webdav/redirect.py
index 71af3271ab7..7bc0883f9e8 100644
--- a/addons/document_webdav/redirect.py
+++ b/addons/document_webdav/redirect.py
@@ -106,3 +106,5 @@ class RedirectHTTPHandler(HttpLogHandler, FixSendError, HttpOptions, HTTPHandler
 
 #eof
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/security/ir.model.access.csv b/addons/document_webdav/security/ir.model.access.csv
index 987f7a4f90a..fa81bcee2e2 100644
--- a/addons/document_webdav/security/ir.model.access.csv
+++ b/addons/document_webdav/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_webdav_dir_property_all","webdav.dir.property all","model_document_webdav_dir_property",,1,0,0,0
-"access_webdav_dir_property_group_doc_manager","webdav.dir.property document manager","model_document_webdav_dir_property","base.group_system",1,1,1,1
-"access_webdav_dir_property_group_system","webdav.dir.property group system","model_document_webdav_dir_property","base.group_system",1,1,1,1
-"access_webdav_file_property_all","webdav.file.property all","model_document_webdav_file_property",,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_webdav_dir_property_all,webdav.dir.property all,model_document_webdav_dir_property,,1,0,0,0

+access_webdav_dir_property_group_doc_manager,webdav.dir.property document manager,model_document_webdav_dir_property,base.group_system,1,1,1,1

+access_webdav_dir_property_group_system,webdav.dir.property group system,model_document_webdav_dir_property,base.group_system,1,1,1,1

+access_webdav_file_property_all,webdav.file.property all,model_document_webdav_file_property,,1,1,1,1

diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index b4317282c6a..3c20cfed5b8 100755
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -704,4 +704,5 @@ class DAVClient(object):
         etag = m.getheader('ETag')
         return etag or True
 
-#eof
\ No newline at end of file
+#eof
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index 3a68fb04fed..baa394e94a1 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -341,3 +341,5 @@ def create_prop(self):
 REPORT.create_prop = create_prop
 
 #eof
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index aeff0a23f25..81435a72137 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -649,3 +649,5 @@ init_principals_redirect()
 
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: