summaryrefslogtreecommitdiff
path: root/addons/document
diff options
context:
space:
mode:
authorStephane Wirtel <stephane@tinyerp.com>2008-11-24 11:59:22 +0100
committerStephane Wirtel <stephane@tinyerp.com>2008-11-24 11:59:22 +0100
commitf8f1668ff5bc99e0cc356c7d24a3e9bb2ddbccc9 (patch)
tree03573662637e975fa59db457d4bcce6ea44d9fe9 /addons/document
parent962434674c0c67a6cc06983fae8f90dda9b91904 (diff)
parent92ffde4e172a3432445cac6aeae78d91b823bc05 (diff)
[MERGE]
bzr revid: stephane@tinyerp.com-20081124105922-ae71byvr4psplbm3
Diffstat (limited to 'addons/document')
-rw-r--r--addons/document/document.py23
-rw-r--r--addons/document/document_view.xml2
2 files changed, 12 insertions, 13 deletions
diff --git a/addons/document/document.py b/addons/document/document.py
index 01ab5e96beb..942eefb2682 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -33,6 +33,17 @@ from content_index import content_index
import netsvc
import StringIO
+import random
+import string
+
+
+def random_name():
+ random.seed()
+ d = [random.choice(string.letters) for x in xrange(10) ]
+ name = "".join(d)
+ return name
+
+
# Unsupported WebDAV Commands:
# label
# search
@@ -462,18 +473,6 @@ class ir_action_report_xml(osv.osv):
ir_action_report_xml()
-
-import random
-import string
-
-
-def random_name():
- random.seed()
- d = [random.choice(string.letters) for x in xrange(10) ]
- name = "".join(d)
- return name
-
-
def create_directory(path):
dir_name = random_name()
path = os.path.join(path,dir_name)
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 9dd27bba66f..2d76d88341c 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -1,7 +1,7 @@
<openerp>
<data>
<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
- <menuitem name="Configuration" id="menu_document_configuration" parent="menu_document"/>
+ <menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>
<record model="ir.ui.view" id="view_document_directory_form">
<field name="name">document.directory</field>