diff options
| author | Antonin Bourguignon <abo@openerp.com> | 2012-09-25 12:33:05 +0200 |
|---|---|---|
| committer | Antonin Bourguignon <abo@openerp.com> | 2012-09-25 12:33:05 +0200 |
| commit | 8a4bd2e816a7293653b1db42f29a9b87f473bf06 (patch) | |
| tree | 79e47872809e337d34ca4a6c58ead571bd464e0f /addons/google_docs | |
| parent | 642e4c02b1fa3685bb386b5821c4216e98681812 (diff) | |
| parent | 7debc08809d8836995d0e79c6299ca91bdee1dfe (diff) | |
[MERGE] latest trunk
bzr revid: abo@openerp.com-20120925103305-6g4bwz3bmf7edmdt
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 |