diff options
| author | Christophe Matthieu <chm@openerp.com> | 2012-10-17 09:31:46 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2012-10-17 09:31:46 +0200 |
| commit | 23e20e95d41d5435cf3e5bfd136a6f52efa8a80f (patch) | |
| tree | 1969e768754adbcb6976a8b32c3eb5d35e778ac4 /addons/google_docs/res_config_user_view.xml | |
| parent | e8bd522f6be7fdeb1b7c916838193d7516833121 (diff) | |
| parent | 8a38ee944e02d6cd6cb18b87b962b67e510906a9 (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20121017073146-9m5s2hffeekmj068
Diffstat (limited to 'addons/google_docs/res_config_user_view.xml')
| -rw-r--r-- | addons/google_docs/res_config_user_view.xml | 29 |
1 files changed, 22 insertions, 7 deletions
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> |