diff options
| author | Atul Patel (OpenERP) <atp@tinyerp.com> | 2012-09-09 16:32:14 +0530 |
|---|---|---|
| committer | Atul Patel (OpenERP) <atp@tinyerp.com> | 2012-09-09 16:32:14 +0530 |
| commit | f1cf4c04b976161fdfc26bcfa0e7a79f190d54db (patch) | |
| tree | 2055d1ca55882e91437df9ead5348f0c2033b75e /addons/google_docs | |
| parent | eb28892a3a947fd683f5bb240f593651831497d2 (diff) | |
| parent | bc619a3e5301ad0f41588d003cc2ffdaa1f03ecb (diff) | |
[MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120909110214-2e1c7e7t43c69zzo
Diffstat (limited to 'addons/google_docs')
| -rw-r--r-- | addons/google_docs/__openerp__.py | 7 | ||||
| -rw-r--r-- | addons/google_docs/static/src/js/gdocs.js | 2 |
2 files changed, 6 insertions, 3 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. +================================================ +""" } diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js index 8f41a9d7b21..694f5736c72 100644 --- a/addons/google_docs/static/src/js/gdocs.js +++ b/addons/google_docs/static/src/js/gdocs.js @@ -3,7 +3,7 @@ var _t = instance.web._t; instance.web.Sidebar = instance.web.Sidebar.extend({ on_attachments_loaded: function(attachments) { - self = this + var self = this; self._super(attachments); // if attachment contains a google doc url do nothing // else display a button to create a google doc |