[IMP]Reverted google doc configuration from documents menu as per new spec

bzr revid: dhr@tinyerp.com-20130228065250-4v5n75cit1afhabd

2 files changed, 12 insertions, 18 deletions

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 9aaa5b41b19..82cd80635ee 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -177,18 +177,14 @@ class config(osv.osv):
 
     _columns = {
         '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`
-#*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`
-#*for a drawing document with url like `https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is `drawings:123456789`
-#...
-#''', required=True),
-        'gdocs_resource_id': fields.selection([('document', 'Document'),
-                                   ('spreadsheet', 'Spreadsheet'),
-                                   ('presentation', 'Presentation')], 'Type of Drive as template',
-                                   required=True, help="""Select here the type of drive you want as a template."""),
+        '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`
+*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`
+*for a drawing document with url like `https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is `drawings:123456789`
+...
+''', required=True),
         'name_template': fields.char('Google Drive Name Pattern', size=64, help='Choose how the new google drive will be named, on google side. Eg. gdoc_%(field_name)s', required=True),
     }
 
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 268ee59801b..ad6560cb465 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -22,11 +22,10 @@
                 <form string="Google Drive Configuration" version="7.0">
                 <group>
                     <field name="model_id"/>
-                    <field name='name_template'/>
                     <label for='gdocs_resource_id'/>
                     <div>
                         <field name='gdocs_resource_id'/>
-                        <!-- <p class="oe_grey">
+                        <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>
@@ -34,11 +33,10 @@ This is the id of the template document, on google side. You can find it thanks
 <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> -->
+                        </p>
                     </div>
-                    
+                    <field name='name_template'/>
                 </group>
-                <button name="" string="Create a template" type="object" class="oe_highlight"/>
                 </form>
             </field>
         </record>
@@ -50,7 +48,7 @@ This is the id of the template document, on google side. You can find it thanks
             <field name='view_type'>form</field>
             <field name='view_id' ref='view_google_docs_config_tree'/>
         </record>
-        <menuitem name='Google Drive configuration' id='menu_gdocs_config' parent='document.menu_document_doc'/>
+        <menuitem name='Google Drive configuration' id='menu_gdocs_config' parent='base.menu_administration'/>
         <menuitem name='Models configuration' id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config'/>
     </data>
 </openerp>