[MERGE] latest trunk

bzr revid: abo@openerp.com-20120917114455-nygv16c93qwcwnsx

4 files changed, 9 insertions, 8 deletions

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 8cc5671e08a..b02f2e912fc 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -29,10 +29,13 @@
     'auto_install': False,
     'web': True,
     'js': ['static/src/js/gdocs.js'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'res_config_user_view.xml'
     ],
     'depends': ['google_base_account'],
-    'description': 'Module to attach a google document to any model.'
+    'description': """
+Module to attach a google document to any model.
+================================================
+"""
 }
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 659c86ad0d1..270c105daab 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -27,7 +27,7 @@ try:
     from gdata.docs.service import DOCUMENT_LABEL
     import gdata.auth
 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'))
+    raise osv.except_osv(_('Google Docs Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list.'))
 
 class google_docs_ir_attachment(osv.osv):
     _inherit = 'ir.attachment'
@@ -46,7 +46,7 @@ class google_docs_ir_attachment(osv.osv):
         #login gmail account
         client = google_pool.google_login( user_config['user'], user_config['password'], type='docs_client', context=context)
         if not client:
-            raise osv.except_osv( _('Google Docs Error!'), _("Check your google configuration in users/synchronization"))
+            raise osv.except_osv( _('Google Docs Error!'), _("Check your google configuration in Users/Users/Synchronization tab."))
         return client
 
     def create_empty_google_doc(self, cr, uid, res_model, res_id, context=None):
@@ -88,7 +88,7 @@ class google_docs_ir_attachment(osv.osv):
             #copy the document you choose in the configuration
             copy_resource = client.copy_resource(original_resource, 'copy_%s' % original_resource.title.text)
         except:
-            raise osv.except_osv(_('Google Docs Error!'), _("Your resource id is not correct. You can find the id in the google docs URL"))
+            raise osv.except_osv(_('Google Docs Error!'), _("Your resource id is not correct. You can find the id in the google docs URL."))
         # create an ir.attachment
         self.create(cr, uid, {
             'res_model': res_model,
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 46abe5b2d80..4aabba3ac5a 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -7,7 +7,6 @@
         <record model="ir.ui.view" id="view_google_docs_config_tree">
             <field name="name">google_docs.config.tree</field>
             <field name="model">google.docs.config</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <group name="default_filters" position="inside">
                     <field name="model_id"/>
@@ -18,7 +17,6 @@
         <record model="ir.ui.view" id="view_google_docs_config_form">
             <field name="name">google_docs.config.form</field>
             <field name="model">google.docs.config</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <group colspan='4'>
                 <field name="model_id"/>
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 8f41a9d7b21..694f5736c72 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -3,7 +3,7 @@ var _t = instance.web._t;
 
     instance.web.Sidebar = instance.web.Sidebar.extend({
         on_attachments_loaded: function(attachments) {
-            self = this
+            var self = this;
             self._super(attachments);
             // if attachment contains a google doc url do nothing
             // else display a button to create a google doc