summaryrefslogtreecommitdiff
path: root/addons/google_docs
diff options
context:
space:
mode:
authorpso (OpenERP) <pso@tinyerp.com>2012-08-23 14:38:41 +0530
committerpso (OpenERP) <pso@tinyerp.com>2012-08-23 14:38:41 +0530
commitc427933cbbd4fdc20619bee39a2f2c2b0ff825a9 (patch)
tree15539a5d9c5e4cd8e5300cf3e8683f63b0f8adbf /addons/google_docs
parent7fe9ca1ed6d8017b4fb0cdb6b50fe15b0ae5aaef (diff)
parentc4b2e9fad2ce2bd2c59aae3d96eb467177b3c7ca (diff)
[MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120823090841-adebkbo3tfhn5bet
Diffstat (limited to 'addons/google_docs')
-rw-r--r--addons/google_docs/__openerp__.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 8cc5671e08a..b02f2e912fc 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -29,10 +29,13 @@
'auto_install': False,
'web': True,
'js': ['static/src/js/gdocs.js'],
- 'update_xml': [
+ 'data': [
'security/ir.model.access.csv',
'res_config_user_view.xml'
],
'depends': ['google_base_account'],
- 'description': 'Module to attach a google document to any model.'
+ 'description': """
+Module to attach a google document to any model.
+================================================
+"""
}