diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2012-09-27 15:29:42 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2012-09-27 15:29:42 +0200 |
| commit | 1322cd1a3deccba742e4ffa2397028cd4f84b26b (patch) | |
| tree | a5ed37d005f9b7152916f89c49ab31e0ea6791eb /addons/google_docs | |
| parent | cf5385a5a8f4f355d8455cbc3aa436d034cce0a5 (diff) | |
| parent | 994fe31313ce8d51c45cf7396e936dccccfc304a (diff) | |
[MERGE] from trunk
bzr revid: fva@openerp.com-20120927132942-853bb3uptrp1x55d
Diffstat (limited to 'addons/google_docs')
| -rw-r--r-- | addons/google_docs/google_docs.py | 6 | ||||
| -rw-r--r-- | addons/google_docs/static/src/js/gdocs.js | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py index 270c105daab..f1477f9c7f2 100644 --- a/addons/google_docs/google_docs.py +++ b/addons/google_docs/google_docs.py @@ -134,8 +134,8 @@ class config(osv.osv): _description = "Google Docs templates config" _columns = { - 'model_id': fields.many2one('ir.model', 'Model'), - 'gdocs_resource_id': fields.char('Google resource ID', size=64,help=''' + 'model_id': fields.many2one('ir.model', 'Model', required=True), + 'gdocs_resource_id': fields.char('Google Resource ID to Use as Template', size=64,help=''' This is the id of the template document, on google side. You can find it thanks to its URL: *for a text document with url like `https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is `document:123456789` *for a spreadsheet document with url like `https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, the ID is `spreadsheet:123456789` @@ -143,7 +143,7 @@ This is the id of the template document, on google side. You can find it thanks *for a drawing document with url like `https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is `drawings:123456789` ... '''), - 'name_template': fields.char('GDoc name template ', size=64, help='This is the name which appears on google side'), + 'name_template': fields.char('Google Doc Name Pattern', size=64, help='Choose how the new google docs will be named, on google side'), } _defaults = { diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js index 694f5736c72..bcfd24f8c0d 100644 --- a/addons/google_docs/static/src/js/gdocs.js +++ b/addons/google_docs/static/src/js/gdocs.js @@ -13,7 +13,7 @@ var _t = instance.web._t; }); if (! flag) { this.add_items('files', [ - { label: _t('Google Doc'), callback: self.on_google_doc }, + { label: _t('Add Google Doc...'), callback: self.on_google_doc }, ]); } }, |