diff options
| author | Fabien Pinckaers <fp@openerp.com> | 2012-10-10 22:47:33 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@openerp.com> | 2012-10-10 22:47:33 +0200 |
| commit | 1d365f0d50c36cd3b06a0c819fc00bd1ea554d88 (patch) | |
| tree | 65ec62e2da6394625c8fa33c85e7d7d540db0c33 /addons/google_docs | |
| parent | dd5f5eca9bced12720fc1aad5b8cba605bd75b48 (diff) | |
| parent | e3cd2d5413626249dcf5ce9f97e692030978025d (diff) | |
[MERGE]
bzr revid: fp@openerp.com-20121010204733-eqg9lhokufm387tr
Diffstat (limited to 'addons/google_docs')
| -rw-r--r-- | addons/google_docs/google_docs.py | 5 | ||||
| -rw-r--r-- | addons/google_docs/res_config_user_view.xml | 21 |
2 files changed, 20 insertions, 6 deletions
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py index f1477f9c7f2..5ff80530c94 100644 --- a/addons/google_docs/google_docs.py +++ b/addons/google_docs/google_docs.py @@ -26,8 +26,11 @@ try: from gdata.client import RequestError from gdata.docs.service import DOCUMENT_LABEL import gdata.auth + from gdata.docs.data import Resource except ImportError: - raise osv.except_osv(_('Google Docs Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list.')) + import logging + _logger = logging.getLogger(__name__) + _logger.warning("Please install latest gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list") class google_docs_ir_attachment(osv.osv): _inherit = 'ir.attachment' diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml index 4aabba3ac5a..766fbb90b43 100644 --- a/addons/google_docs/res_config_user_view.xml +++ b/addons/google_docs/res_config_user_view.xml @@ -18,11 +18,22 @@ <field name="name">google_docs.config.form</field> <field name="model">google.docs.config</field> <field name="arch" type="xml"> - <group colspan='4'> - <field name="model_id"/> - <field name='gdocs_resource_id'/> - <field name='name_template'/> - </group> + <group> + <field name="model_id"/> + <label for='gdocs_resource_id'/> + <div> + <field name='gdocs_resource_id'/> + <p class="oe_grey"> +This is the id of the template document, on google side. You can find it thanks to its URL: +<ul> +<li>for a text document with url like `https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is `document:123456789`</li> +<li>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`</li> +<li>for a presentation (slide show) document with url like `https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id.p`, the ID is `presentation:123456789`</li> +<li>for a drawing document with url like `https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is `drawings:123456789`</li> + </p> + </div> + <field name='name_template'/> + </group> </field> </record> |