diff options
| author | Divyesh Makwana (Open ERP) <mdi@tinyerp.com> | 2012-10-12 10:37:05 +0530 |
|---|---|---|
| committer | Divyesh Makwana (Open ERP) <mdi@tinyerp.com> | 2012-10-12 10:37:05 +0530 |
| commit | 1cd25702a00336ae4ef1c0d5cfdccbe586f99fea (patch) | |
| tree | b897180e6b92505b0c85c14e873cbf5e86843f78 /addons/google_docs | |
| parent | c1fdc5b3662b1a2bb23da2d2005dc176a4430c21 (diff) | |
| parent | f830a534d67cd34dc4b98f9207cbaab6fd80e966 (diff) | |
[Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121012050705-3mjloiqkfgz6q8jr
Diffstat (limited to 'addons/google_docs')
| -rw-r--r-- | addons/google_docs/__openerp__.py | 1 | ||||
| -rw-r--r-- | addons/google_docs/google_docs.py | 5 | ||||
| -rw-r--r-- | addons/google_docs/res_config_user_view.xml | 29 |
3 files changed, 26 insertions, 9 deletions
diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py index b02f2e912fc..8b9a4123aa9 100644 --- a/addons/google_docs/__openerp__.py +++ b/addons/google_docs/__openerp__.py @@ -27,7 +27,6 @@ 'category': 'Tools', 'installable': True, 'auto_install': False, - 'web': True, 'js': ['static/src/js/gdocs.js'], 'data': [ 'security/ir.model.access.csv', 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..e6c4223735f 100644 --- a/addons/google_docs/res_config_user_view.xml +++ b/addons/google_docs/res_config_user_view.xml @@ -8,9 +8,10 @@ <field name="name">google_docs.config.tree</field> <field name="model">google.docs.config</field> <field name="arch" type="xml"> - <group name="default_filters" position="inside"> + <tree string="Google Docs Configuration"> <field name="model_id"/> - </group> + <field name="name_template"/> + </tree> </field> </record> @@ -18,11 +19,25 @@ <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> + <form string="Google Docs Configuration" version="7.0"> + <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> +</ul> + </p> + </div> + <field name='name_template'/> + </group> + </form> </field> </record> |