[MERGE]Merged lp:~openerp-dev/openobject-addons/trunk-google-doc-integration-dhr-create-template-rpr

bzr revid: dhr@tinyerp.com-20130227073227-5xc6196f994bv5kt

addons/google_base_account/google_base_account_view.xml

@@ -7,7 +7,7 @@
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook" position="inside">
-                    <page string="Synchronization">
+                    <page string="Google Drive Account">
                         <group string="Google Account" colspan="4">
                             <field name="gmail_user"/>
                             <field name="gmail_password" password="True"/>

addons/google_docs/__openerp__.py

@@ -27,8 +27,8 @@
     'category': 'Tools',
     'installable': True,
     'auto_install': False,
-    'js': ['static/src/js/gdocs.js'],
-    'qweb': ['static/src/xml/gdocs.xml'],
+#    'js': ['static/src/js/gdocs.js'],
+#    'qweb': ['static/src/xml/gdocs.xml'],
     'data': [
         'security/ir.model.access.csv',
         'res_config_user_view.xml'