summaryrefslogtreecommitdiff
path: root/addons/document
diff options
context:
space:
mode:
authorpso (OpenERP) <pso@tinyerp.com>2012-07-25 18:23:32 +0530
committerpso (OpenERP) <pso@tinyerp.com>2012-07-25 18:23:32 +0530
commite5da0e191b1c3d778f7d6d2ba4f2ff0fc726ecbd (patch)
tree4314f65784b65fdcbdd88f3c556c57ccdc4db3d8 /addons/document
parent082513a80587c3732f13a89edda7c5ba4fcd8410 (diff)
parentac580aeae09c2bc76e7c5c090567b7bc7ba24b25 (diff)
[MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
Diffstat (limited to 'addons/document')
-rw-r--r--addons/document/__openerp__.py6
-rw-r--r--addons/document/nodes.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index d8e42703efc..d9ad9a09675 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -29,7 +29,7 @@ This is a complete document management system.
==============================================
* User Authentication
- * Document Indexation :- .pptx and .docx files are not supported in Windows platform.
+ * Document Indexation:- .pptx and .docx files are not supported in Windows platform.
* Dashboard for Document that includes:
* New Files (list)
* Files by Resource Type (graph)
@@ -37,8 +37,8 @@ This is a complete document management system.
* Files Size by Month (graph)
ATTENTION:
- - When you install this module in a running company that have already PDF files stored into the database,
- you will lose them all.
+ - When you install this module in a running company that have already PDF
+ files stored into the database, you will lose them all.
- After installing this module PDF's are no longer stored into the database,
but in the servers rootpad like /server/bin/filestore.
""",
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index 7843ffd8314..ea18f630314 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -375,7 +375,7 @@ class node_class(object):
could do various things.
Should also consider node<->content, dir<->dir moves etc.
- Move operations, as instructed from APIs (eg. request from DAV) could
+ Move operations, as instructed from APIs (e.g. request from DAV) could
use this function.
"""
raise NotImplementedError(repr(self))