From 6cc272049cead346d963e52e2437b54e39fa06e0 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Mon, 25 Feb 2013 14:46:39 +0530
Subject: [PATCH 01/61] [IMP]Renaming google docs to google drive

bzr revid: dhr@tinyerp.com-20130225091639-s0m5xd110yozak0q
---
 addons/google_docs/__openerp__.py           |  2 +-
 addons/google_docs/google_docs.py           | 10 +++++-----
 addons/google_docs/res_config_user_view.xml |  6 +++---
 addons/google_docs/static/src/xml/gdocs.xml |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 2d064fdb8a9..21a56a5767c 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Google Docs integration',
+    'name': 'Google Drive integration',
     'version': '0.2',
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index cdb14de1de3..d2e746c33e7 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -126,7 +126,7 @@ class google_docs_ir_attachment(osv.osv):
             #copy the document you choose in the configuration
             copy_resource = client.copy_resource(doc, name_gdocs)
         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 Drive 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,
@@ -150,7 +150,7 @@ class google_docs_ir_attachment(osv.osv):
           :return: the google document object created
         '''
         if len(ids) != 1:
-            raise osv.except_osv(_('Google Docs Error!'), _("Creating google docs may only be done by one at a time."))
+            raise osv.except_osv(_('Google Drive Error!'), _("Creating google drive may only be done by one at a time."))
         res_id = ids[0]
         pool_ir_attachment = self.pool.get('ir.attachment')
         pool_gdoc_config = self.pool.get('google.docs.config')
@@ -164,7 +164,7 @@ class google_docs_ir_attachment(osv.osv):
             try:
                 name_gdocs = name_gdocs % model_fields_dic
             except:
-                raise osv.except_osv(_('Key Error!'), _("Your Google Doc Name Pattern's key does not found in object."))
+                raise osv.except_osv(_('Key Error!'), _("Your Google Drive Name Pattern's key does not found in object."))
             google_template_id = pool_gdoc_config.browse(cr, uid, google_docs_config[0], context=context).gdocs_resource_id
             google_document = pool_ir_attachment.copy_gdoc(cr, uid, res_model, res_id, name_gdocs, google_template_id, context=context)
         else:
@@ -173,7 +173,7 @@ class google_docs_ir_attachment(osv.osv):
 
 class config(osv.osv):
     _name = 'google.docs.config'
-    _description = "Google Docs templates config"
+    _description = "Google Drive templates config"
 
     _columns = {
         'model_id': fields.many2one('ir.model', 'Model', required=True),
@@ -185,7 +185,7 @@ This is the id of the template document, on google side. You can find it thanks
 *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 Doc Name Pattern', size=64, help='Choose how the new google docs will be named, on google side. Eg. gdoc_%(field_name)s', 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),
     }
 
     _defaults = {
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index e6c4223735f..68cf074a4ff 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -8,7 +8,7 @@
             <field name="name">google_docs.config.tree</field>
             <field name="model">google.docs.config</field>
             <field name="arch" type="xml">
-                <tree string="Google Docs Configuration">
+                <tree string="Google Drive Configuration">
                     <field name="model_id"/>
                     <field name="name_template"/>
                 </tree>
@@ -19,7 +19,7 @@
             <field name="name">google_docs.config.form</field>
             <field name="model">google.docs.config</field>
             <field name="arch" type="xml">
-                <form string="Google Docs Configuration" version="7.0">
+                <form string="Google Drive Configuration" version="7.0">
                 <group>
                     <field name="model_id"/>
                     <label for='gdocs_resource_id'/>
@@ -48,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 Docs configuration' id='menu_gdocs_config' parent='base.menu_administration'/>
+        <menuitem name='Google Drive configuration' id='menu_gdocs_config' parent='document.menu_document_management_configuration'/>
         <menuitem name='Models configuration' id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config'/>
     </data>
 </openerp>
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_docs/static/src/xml/gdocs.xml
index 0c8d9c3b01f..e0cfd5cf25c 100644
--- a/addons/google_docs/static/src/xml/gdocs.xml
+++ b/addons/google_docs/static/src/xml/gdocs.xml
@@ -3,6 +3,6 @@
 -->
 <templates id="template" xml:space="preserve">
 <t t-name="AddGoogleDocumentItem">
-     <li class="oe_sidebar_add_google_doc"><span><b>Add Google Doc...</b></span></li>
+     <li class="oe_sidebar_add_google_doc"><span><b>Add Google Drive...</b></span></li>
 </t>
 </templates>

From f06b26f4d591cab554a8939ed3a54928c0ba66e3 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Tue, 26 Feb 2013 11:25:25 +0530
Subject: [PATCH 02/61] [IMP]Creating a tempalate for automatically creating a
 doc

bzr revid: dhr@tinyerp.com-20130226055525-dvrlc9siy0cb8knl
---
 addons/google_docs/google_docs.py           | 22 ++++++++++++---------
 addons/google_docs/res_config_user_view.xml | 10 ++++++----
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index d2e746c33e7..9aaa5b41b19 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -94,7 +94,7 @@ class google_docs_ir_attachment(osv.osv):
         client = self._auth(cr, uid, context=context)
         # create the document in google docs
         title = "%s %s" % (context.get("name","Untitled Document."), datetime.today().strftime(DEFAULT_SERVER_DATETIME_FORMAT))
-        local_resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL,title=title)
+        local_resource = gdata.docs.data.Resource(gdata.docs.data.SPREADSHEET_LABEL,title=title)
         #create a new doc in Google Docs 
         gdocs_resource = client.post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
         # create an ir.attachment into the db
@@ -177,14 +177,18 @@ 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.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."""),
         '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 68cf074a4ff..268ee59801b 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -22,10 +22,11 @@
                 <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>
@@ -33,10 +34,11 @@ 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>
@@ -48,7 +50,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_management_configuration'/>
+        <menuitem name='Google Drive configuration' id='menu_gdocs_config' parent='document.menu_document_doc'/>
         <menuitem name='Models configuration' id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config'/>
     </data>
 </openerp>

From 15140b69f78a354cd081699808589c90bce7eaed Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Wed, 27 Feb 2013 12:57:08 +0530
Subject: [PATCH 03/61] [IMP] google_docs : string changed as per specification

bzr revid: rpr@tinyerp.com-20130227072708-27y084xaien29kfw
---
 addons/google_base_account/google_base_account_view.xml | 2 +-
 addons/google_docs/__openerp__.py                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/google_base_account/google_base_account_view.xml b/addons/google_base_account/google_base_account_view.xml
index 8613582692f..11920768b34 100644
--- a/addons/google_base_account/google_base_account_view.xml
+++ b/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"/>
diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 21a56a5767c..12ee469f7dc 100644
--- a/addons/google_docs/__openerp__.py
+++ b/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'

From 2154cdbd066596cb1b3f555317331433e7e2b277 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Thu, 28 Feb 2013 12:22:50 +0530
Subject: [PATCH 04/61] [IMP]Reverted google doc configuration from documents
 menu as per new spec

bzr revid: dhr@tinyerp.com-20130228065250-4v5n75cit1afhabd
---
 addons/google_docs/google_docs.py           | 20 ++++++++------------
 addons/google_docs/res_config_user_view.xml | 10 ++++------
 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>

From 5b68aa7d83c25e635f5c2c44be7334e9c6dd22b1 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Thu, 28 Feb 2013 12:58:22 +0530
Subject: [PATCH 05/61] [IMP]Changed the model template

bzr revid: dhr@tinyerp.com-20130228072822-dxbuk1jjljcofp82
---
 addons/google_docs/google_docs.py           | 10 ++------
 addons/google_docs/res_config_user_view.xml | 27 +++++++++++++--------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 82cd80635ee..e507ce33b16 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -177,14 +177,8 @@ 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),
+        'filter_id' : fields.many2one('ir.filters', 'Filter'),
+        'template_url': fields.char('Template Url', required=True, size=1024),
         '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 ad6560cb465..8d023b4f6f5 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -22,20 +22,27 @@
                 <form string="Google Drive Configuration" version="7.0">
                 <group>
                     <field name="model_id"/>
-                    <label for='gdocs_resource_id'/>
+                    <label for='filter_id'/>
                     <div>
-                        <field name='gdocs_resource_id'/>
+                        <field name='filter_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>
+					To Create a new filter, go to the list of documents you want to attach a google document to and 
+					save the filter.Then come back ti this view.The saved filter will be available in the filed above.
+					For instance,to attach a document to the sales orders of Agrolait,you go to sales orders list view,
+					filter on Agrolait and save the filter.
                         </p>
                     </div>
-                    <field name='name_template'/>
+                    <field name='template_url' placeholder="https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcua4/edit"/>
+                    <label for='name_template'/>
+                    <div>
+                    	<field name='name_template'/>
+                    	<p class="oe_grey">
+                    		The name of the attached document can use fixed or variable data. To distinguish between documents in
+					Google Drive,use fixed words and fields.For instance,in the example above,if you wrote Agrolait_%%(name)s_Sales
+					in the Google Drive name field,the document in your Google Drive and in OpenERP attachment will be named
+					'Agrolait_SO0001_Sales'.
+                    	</p>
+                    </div>
                 </group>
                 </form>
             </field>

From b992b715e5a02d24441e0f49fa01eacc84ce5c4b Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Thu, 28 Feb 2013 14:06:47 +0530
Subject: [PATCH 06/61] [IMP] google_docs : google docs configuration added to
 general settings

bzr revid: rpr@tinyerp.com-20130228083647-xrglmy1sfha0d3ep
---
 addons/base_setup/res_config.py             |  2 ++
 addons/base_setup/res_config_view.xml       |  9 +++++++++
 addons/google_docs/res_config_user_view.xml | 16 ++++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 33c5aa863bf..b2e8115c1f9 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -36,6 +36,8 @@ class base_config_settings(osv.osv_memory):
             help="""Enable the public part of openerp, openerp becomes a public website."""),
         'module_auth_oauth': fields.boolean('Use external authentication providers, sign in with google, facebook, ...'),
         'module_base_import': fields.boolean("Allow users to import data from CSV files"),
+        'module_google_docs': fields.boolean('Attach a google document to any record',
+            help="""Install the google docs module."""),
     }
 
     def open_company(self, cr, uid, ids, context=None):
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 9e026184c9d..63bd1d75383 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -81,6 +81,15 @@
                             </div>
                         </div>
                     </group>
+                    <group>
+                        <label for="id" string="Google Drive"/>
+                        <div name="google_drive">
+                            <div name="google_docs">
+                                <field name="module_google_docs" class="oe_inline"/>
+                                <label for="module_google_docs"/>
+                            </div>
+                        </div>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index ad6560cb465..a1fe77a9211 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -48,6 +48,22 @@ 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>
+
+        <record id="inherited_google_view_general_configuration" model="ir.ui.view">
+        <field name="name">General Settings</field>
+        <field name="model">base.config.settings</field>
+        <field name="inherit_id" ref="base_setup.view_general_configuration"/>
+        <field name="arch" type="xml">
+          <xpath expr="//div[@name='google_docs']" position="after">
+            <div attrs="{'invisible': [('module_google_docs','=',False)]}">
+                <button type="action"
+                name="%(google_docs.action_google_docs_users_config)d"
+                string="Configure Template" class="oe_link"/>
+            </div>
+          </xpath>
+        </field>
+    </record>
+
         <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>

From 4798074cd4c415b6462f0d2e21fba289fc564361 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 1 Mar 2013 18:45:42 +0530
Subject: [PATCH 07/61] [IMP] google_docs : demo data added for google template

bzr revid: rpr@tinyerp.com-20130301131542-s1ww320s4n8addi6
---
 addons/crm/crm_lead_demo.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 21d60ad2961..2478673d8a2 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -698,5 +698,22 @@ Andrew</field>
             eval="[ ref('msg_case18_1'), ref('msg_case18_2')], True, {}"
         />
 
+<!-- filter demo  -->    
+      <record id="filter_crm" model="ir.filters">
+          <field name="name">Sales Team</field>
+          <field name="user_id" ref="base.user_root"/>
+          <field name="model_id">crm.lead</field>
+          <field name="is_default">False</field>
+          <field name="domain">[['section_id', 'ilike', 'sales department']]</field>
+          <field name="context">{'lang': 'en_US', 'tz': 'Europe/Brussels', 'uid': 1}</field>
+      </record>       
+
+<!-- template demo -->
+      <record id="template_crm" model="google.docs.config">
+          <field name="model_id" ref="crm.model_crm_lead"/>
+          <field name="filter_id" ref="filter_crm"/>
+          <field name="template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
+          <field name="name_template">lead_sales-department_%(name)s_review</field>
+      </record>
     </data>
 </openerp>

From 62fc309e0c6a91cf97956ff00bf423d930b81840 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Mon, 4 Mar 2013 10:50:58 +0530
Subject: [PATCH 08/61] [IMP]Putting a domain of filter to see only filters of
 the choosen model.

bzr revid: dhr@tinyerp.com-20130304052058-fzs7a6ct9d1xb5so
---
 addons/google_docs/google_docs.py           | 11 +++++++++++
 addons/google_docs/res_config_user_view.xml |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index e507ce33b16..73f4bca3664 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -182,6 +182,17 @@ class config(osv.osv):
         '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),
     }
 
+    def onchange_model_id(self, cr, uid, ids, model_id):
+        res = {'domain':{'filter_id':[]}}
+        if model_id:
+            model_name = self.pool.get('ir.model').read(cr, uid, model_id, ['model'])
+            if model_name:
+                mod_name = model_name['model']
+                res['domain'] = {'filter_id': [('model_id', '=', mod_name)]}
+        else:
+            res['value'] = {'filter_id': False}
+        return res
+
     _defaults = {
         'name_template': 'gdoc_%(name)s',
     }
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index de6f140bce4..40d4cd94093 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -21,7 +21,7 @@
             <field name="arch" type="xml">
                 <form string="Google Drive Configuration" version="7.0">
                 <group>
-                    <field name="model_id"/>
+                    <field name="model_id" on_change="onchange_model_id(model_id)"/>
                     <label for='filter_id'/>
                     <div>
                         <field name='filter_id'/>

From 7db017fb82963d5309f8aa86b2f48ae0a6190e2c Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Tue, 5 Mar 2013 18:47:57 +0530
Subject: [PATCH 09/61] [IMP]Making gdoc_resource_id as a function field and
 Checking for the google doc template and creating while creating and editing
 any record matching the filter criteria

bzr revid: dhr@tinyerp.com-20130305131757-sseqparoc0j2m9ax
---
 addons/google_docs/google_docs.py           | 142 +++++++++++++++++++-
 addons/google_docs/res_config_user_view.xml |   3 +-
 2 files changed, 142 insertions(+), 3 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 73f4bca3664..099890665f8 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -21,8 +21,10 @@ import logging
 from datetime import datetime
 
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp import SUPERUSER_ID
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
+from urlparse import urlparse
 
 _logger = logging.getLogger(__name__)
 
@@ -174,11 +176,27 @@ class google_docs_ir_attachment(osv.osv):
 class config(osv.osv):
     _name = 'google.docs.config'
     _description = "Google Drive templates config"
+    
+    def _resource_get(self, cr, uid, ids, name, arg, context=None):
+        result = {}
+        for data in self.browse(cr, uid, ids, context):
+            template_url = data.gdocs_template_url
+            url = urlparse(template_url)
+            res = url.path.split('/')
+            resource = res[1]
+            if res[1]== "spreadsheet":
+                key = url.query.split('=')[1]
+            else:
+                key = res[3]
+            res_id = resource + ":" + key
+            result[data.id] = str(res_id)
+        return result
 
     _columns = {
         'model_id': fields.many2one('ir.model', 'Model', required=True),
         'filter_id' : fields.many2one('ir.filters', 'Filter'),
-        'template_url': fields.char('Template Url', required=True, size=1024),
+        'gdocs_template_url': fields.char('Template Url', required=True, size=1024),
+        'gdocs_resource_id' : fields.function(_resource_get,type="char" ,string='Resource Id',store=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),
     }
 
@@ -194,6 +212,126 @@ class config(osv.osv):
         return res
 
     _defaults = {
-        'name_template': 'gdoc_%(name)s',
+        'name_template': '%(name)s_model_filter_gdoc',
     }
+
+    def _wrap_create(self, old_create, model):
+        """ Return a wrapper around `old_create` calling both `old_create` and
+            `_process`, in that order.
+        """
+        def wrapper(cr, uid, vals, context=None):
+            # avoid loops or cascading actions
+            
+            if context and context.get('action'):
+                return old_create(cr, uid, vals, context=context)
+            
+            context = dict(context or {}, action=True)
+            new_id = old_create(cr, uid, vals, context=context)
+            
+            # as it is a new record, we do not consider the actions that have a prefilter
+            action_dom = [('model_id', '=', model)]
+            config_ids = self.search(cr, uid, action_dom, context=context)
+#
+#            # check postconditions, and execute actions on the records that satisfy them
+            for action in self.browse(cr, uid, config_ids, context=context):
+                if self._filter(cr, uid, action, action.filter_id, [new_id], context=context):
+                    self._process(cr, uid, action, [new_id], context=context)
+            return new_id
+
+        return wrapper
+    
+    def _filter(self, cr, uid, action, action_filter, record_ids, context=None):
+        """ filter the list record_ids that satisfy the action filter """
+        if record_ids and action_filter:
+            assert action.model_id.model == action_filter.model_id, "Filter model different from action rule model"
+            model = self.pool.get(action_filter.model_id)
+            domain = [('id', 'in', record_ids)] + eval(action_filter.domain)
+            ctx = dict(context or {})
+            ctx.update(eval(action_filter.context)) 
+            record_ids = model.search(cr, uid, domain, context=ctx)
+        return record_ids
+    
+    def _process(self, cr, uid, action, record_ids, context=None):
+        """ process the given action on the records """
+        # execute server actions
+        model = self.pool.get(action.model_id.model)
+        template_url = action.gdocs_template_url
+        attach_obj = self.pool.get('ir.attachment')
+        for record_id in record_ids:
+            record_id = int(record_id)
+            model_fields_dic = self.pool.get(action.model_id.model).read(cr, uid, record_id, [], context=context)
+            name_gdocs = action.name_template
+            name_gdocs = name_gdocs.replace('model',action.model_id.name)
+            name_gdocs = name_gdocs.replace('filter',action.filter_id.name)
+            try:
+                name_gdocs = name_gdocs % model_fields_dic
+            except:
+                raise osv.except_osv(_('Key Error!'), _("Your Google Drive Name Pattern's key does not found in object."))
+            attachments = attach_obj.search(cr, uid, [('res_id','=',record_id),('name','=',name_gdocs)])
+            if not attachments:
+                google_template_id = action.gdocs_resource_id
+                attach_obj.copy_gdoc(cr, uid, action.model_id.model, record_id, name_gdocs, google_template_id, context=context)
+        return True
+
+    def _wrap_write(self, old_write, model):
+        """ Return a wrapper around `old_write` calling both `old_write` and
+            `_process`, in that order.
+        """
+        def wrapper(cr, uid, ids, vals, context=None):
+            # avoid loops or cascading actions
+            if context and context.get('action'):
+                return old_write(cr, uid, ids, vals, context=context)
+
+            context = dict(context or {}, action=True)
+            ids = [ids] if isinstance(ids, (int, long, str)) else ids
+
+            # retrieve the action rules to possibly execute
+            action_dom = [('model_id', '=', model)]
+            config_ids = self.search(cr, uid, action_dom, context=context)
+            gconfigs = self.browse(cr, uid, config_ids, context=context)
+
+            # check preconditions
+            pre_ids = {}
+            for gconfig in gconfigs:
+                pre_ids[gconfig] = self._filter(cr, uid, gconfig, gconfig.filter_id, ids, context=context)
+
+            # execute write
+            old_write(cr, uid, ids, vals, context=context)
+
+            # check postconditions, and execute actions on the records that satisfy them
+            for gconfig in gconfigs:
+                post_ids = self._filter(cr, uid, gconfig, gconfig.filter_id, pre_ids[gconfig], context=context)
+                print 'post_idsss',post_ids
+                if post_ids:
+                    print 'post_idsss',post_ids
+                    self._process(cr, uid, gconfig, post_ids, context=context)
+            return True
+
+        return wrapper
+
+    def _register_hook(self, cr, ids=None):
+        """ Wrap the methods `create` and `write` of the models specified by
+            the rules given by `ids` (or all existing rules if `ids` is `None`.)
+        """
+        if ids is None:
+            ids = self.search(cr, SUPERUSER_ID, [])
+        for config in self.browse(cr, SUPERUSER_ID, ids):
+            model = config.model_id.model
+            model_obj = self.pool.get(model)
+            model_obj.create = self._wrap_create(model_obj.create, model)
+            model_obj.write = self._wrap_write(model_obj.write, model)
+        return True
+
+    def create(self, cr, uid, vals, context=None):
+        res_id = super(config, self).create(cr, uid, vals, context=context)
+        self._register_hook(cr, [res_id])
+        return res_id
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        super(config, self).write(cr, uid, ids, vals, context=context)
+        self._register_hook(cr, ids)
+        return True
+
 config()
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 40d4cd94093..83d5a1ef84f 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -32,7 +32,8 @@
 					filter on Agrolait and save the filter.
                         </p>
                     </div>
-                    <field name='template_url' placeholder="https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcua4/edit"/>
+                    <field name='gdocs_template_url' placeholder="https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcua4/edit" required="1"/>
+                    <field name='gdocs_resource_id' invisible="1"/>
                     <label for='name_template'/>
                     <div>
                     	<field name='name_template'/>

From bb517b020f922048ab3eef8345018e9959543e4a Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Wed, 6 Mar 2013 11:01:38 +0530
Subject: [PATCH 10/61] [IMP]Improved demo data

bzr revid: dhr@tinyerp.com-20130306053138-nf7hfjxb8ujqyic3
---
 addons/crm/crm_lead_demo.xml      | 4 ++--
 addons/google_docs/google_docs.py | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 2478673d8a2..85752d17fa5 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -712,8 +712,8 @@ Andrew</field>
       <record id="template_crm" model="google.docs.config">
           <field name="model_id" ref="crm.model_crm_lead"/>
           <field name="filter_id" ref="filter_crm"/>
-          <field name="template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
-          <field name="name_template">lead_sales-department_%(name)s_review</field>
+          <field name="gdocs_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
+          <field name="name_template">Plan to attend meeting_Leads_Agrolait_gdoc</field>
       </record>
     </data>
 </openerp>
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 099890665f8..c41f1b5e82a 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -262,7 +262,8 @@ class config(osv.osv):
             model_fields_dic = self.pool.get(action.model_id.model).read(cr, uid, record_id, [], context=context)
             name_gdocs = action.name_template
             name_gdocs = name_gdocs.replace('model',action.model_id.name)
-            name_gdocs = name_gdocs.replace('filter',action.filter_id.name)
+            if action.filter_id:
+                name_gdocs = name_gdocs.replace('filter',action.filter_id.name)
             try:
                 name_gdocs = name_gdocs % model_fields_dic
             except:

From 5882be5747dc1cb68c2b1b73ed224a36d815dee1 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Wed, 6 Mar 2013 15:17:20 +0530
Subject: [PATCH 11/61] [IMP]Changed demo data,Changed the dependencies,removed
 knowledge from dependency, and changed access rights

bzr revid: dhr@tinyerp.com-20130306094720-7r5awynvi799yvjk
---
 addons/crm/crm_lead_demo.xml                  | 16 -------------
 addons/google_docs/__openerp__.py             |  5 +++-
 addons/google_docs/google_docs.py             |  1 -
 addons/google_docs/google_docs_demo.xml       | 24 +++++++++++++++++++
 .../google_docs/security/ir.model.access.csv  |  2 +-
 5 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 addons/google_docs/google_docs_demo.xml

diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 85752d17fa5..70b186a633d 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -698,22 +698,6 @@ Andrew</field>
             eval="[ ref('msg_case18_1'), ref('msg_case18_2')], True, {}"
         />
 
-<!-- filter demo  -->    
-      <record id="filter_crm" model="ir.filters">
-          <field name="name">Sales Team</field>
-          <field name="user_id" ref="base.user_root"/>
-          <field name="model_id">crm.lead</field>
-          <field name="is_default">False</field>
-          <field name="domain">[['section_id', 'ilike', 'sales department']]</field>
-          <field name="context">{'lang': 'en_US', 'tz': 'Europe/Brussels', 'uid': 1}</field>
-      </record>       
 
-<!-- template demo -->
-      <record id="template_crm" model="google.docs.config">
-          <field name="model_id" ref="crm.model_crm_lead"/>
-          <field name="filter_id" ref="filter_crm"/>
-          <field name="gdocs_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
-          <field name="name_template">Plan to attend meeting_Leads_Agrolait_gdoc</field>
-      </record>
     </data>
 </openerp>
diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 12ee469f7dc..91ea392b9be 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -33,7 +33,10 @@
         'security/ir.model.access.csv',
         'res_config_user_view.xml'
     ],
-    'depends': ['google_base_account','document'],
+    'demo': [
+        'google_docs_demo.xml'
+    ],
+    'depends': ['google_base_account','crm'],
     '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 c41f1b5e82a..20a88e0823a 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -231,7 +231,6 @@ class config(osv.osv):
             # as it is a new record, we do not consider the actions that have a prefilter
             action_dom = [('model_id', '=', model)]
             config_ids = self.search(cr, uid, action_dom, context=context)
-#
 #            # check postconditions, and execute actions on the records that satisfy them
             for action in self.browse(cr, uid, config_ids, context=context):
                 if self._filter(cr, uid, action, action.filter_id, [new_id], context=context):
diff --git a/addons/google_docs/google_docs_demo.xml b/addons/google_docs/google_docs_demo.xml
new file mode 100644
index 00000000000..d41f755e55f
--- /dev/null
+++ b/addons/google_docs/google_docs_demo.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+<!-- filter demo  -->    
+      <record id="filter_crm" model="ir.filters">
+          <field name="name">Sales Team</field>
+          <field name="model_id">crm.lead</field>
+          <field name="is_default">False</field>
+          <field name="domain">[['section_id', 'ilike', 'sales department']]</field>
+          <field name="context">{'lang': 'en_US', 'tz': 'Europe/Brussels', 'uid': 1}</field>
+      </record>    
+
+<!-- template demo -->
+      <record id="template_crm" model="google.docs.config">
+          <field name="model_id" ref="crm.model_crm_lead"/>
+          <field name="filter_id" ref="filter_crm"/>
+          <field name="gdocs_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
+          <field name="name_template">lead_sales-department_%(name)s_review</field>
+      </record>
+      
+    </data>
+</openerp>
+
diff --git a/addons/google_docs/security/ir.model.access.csv b/addons/google_docs/security/ir.model.access.csv
index 9393d586fb8..1a2040784f8 100644
--- a/addons/google_docs/security/ir.model.access.csv
+++ b/addons/google_docs/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_google_docs,google.docs.config,model_google_docs_config,,1,0,0,0
+access_google_docs_all,google.docs.config,model_google_docs_config,,1,0,0,0
 access_google_docs,google.docs.config,model_google_docs_config,base.group_system,1,1,1,1
\ No newline at end of file

From f26fea2a09ab5841a22c0413e6d51c932cf9cac3 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Fri, 8 Mar 2013 19:00:39 +0530
Subject: [PATCH 12/61] [IMP]Adding virtual entry of gdoc template for a
 particular record to more based on filter

bzr revid: dhr@tinyerp.com-20130308133039-lme2p04ak2pviurt
---
 addons/google_docs/__openerp__.py           |   4 +-
 addons/google_docs/google_docs.py           | 364 +++++++++++---------
 addons/google_docs/res_config_user_view.xml |   4 +-
 addons/google_docs/static/src/js/gdocs.js   |  86 +++--
 addons/google_docs/static/src/xml/gdocs.xml |   8 +-
 5 files changed, 265 insertions(+), 201 deletions(-)

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 91ea392b9be..f804ecc99b4 100644
--- a/addons/google_docs/__openerp__.py
+++ b/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'
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 20a88e0823a..dd5b7f0ecc6 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -86,30 +86,30 @@ class google_docs_ir_attachment(osv.osv):
         _logger.info('Logged into google docs as %s', user_config['user'])
         return client
 
-    def create_empty_google_doc(self, cr, uid, res_model, res_id, context=None):
-        '''Create a new google document, empty and with a default type (txt)
-           :param res_model: the object for which the google doc is created
-           :param res_id: the Id of the object for which the google doc is created
-           :return: the ID of the google document object created
-        '''
-        #login with the base account google module
-        client = self._auth(cr, uid, context=context)
-        # create the document in google docs
-        title = "%s %s" % (context.get("name","Untitled Document."), datetime.today().strftime(DEFAULT_SERVER_DATETIME_FORMAT))
-        local_resource = gdata.docs.data.Resource(gdata.docs.data.SPREADSHEET_LABEL,title=title)
-        #create a new doc in Google Docs 
-        gdocs_resource = client.post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
-        # create an ir.attachment into the db
-        self.create(cr, uid, {
-            'res_model': res_model,
-            'res_id': res_id,
-            'type': 'url',
-            'name': title,
-            'url': gdocs_resource.get_alternate_link().href,
-        }, context=context)
-        return {'resource_id': gdocs_resource.resource_id.text,
-                'title': title,
-                'url': gdocs_resource.get_alternate_link().href}
+#    def create_empty_google_doc(self, cr, uid, res_model, res_id, context=None):
+#        '''Create a new google document, empty and with a default type (txt)
+#           :param res_model: the object for which the google doc is created
+#           :param res_id: the Id of the object for which the google doc is created
+#           :return: the ID of the google document object created
+#        '''
+#        #login with the base account google module
+#        client = self._auth(cr, uid, context=context)
+#        # create the document in google docs
+#        title = "%s %s" % (context.get("name","Untitled Document."), datetime.today().strftime(DEFAULT_SERVER_DATETIME_FORMAT))
+#        local_resource = gdata.docs.data.Resource(gdata.docs.data.SPREADSHEET_LABEL,title=title)
+#        #create a new doc in Google Docs 
+#        gdocs_resource = client.post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
+#        # create an ir.attachment into the db
+#        self.create(cr, uid, {
+#            'res_model': res_model,
+#            'res_id': res_id,
+#            'type': 'url',
+#            'name': title,
+#            'url': gdocs_resource.get_alternate_link().href,
+#        }, context=context)
+#        return {'resource_id': gdocs_resource.resource_id.text,
+#                'title': title,
+#                'url': gdocs_resource.get_alternate_link().href}
 
     def copy_gdoc(self, cr, uid, res_model, res_id, name_gdocs, gdoc_template_id, context=None):
         '''
@@ -154,24 +154,50 @@ class google_docs_ir_attachment(osv.osv):
         if len(ids) != 1:
             raise osv.except_osv(_('Google Drive Error!'), _("Creating google drive may only be done by one at a time."))
         res_id = ids[0]
-        pool_ir_attachment = self.pool.get('ir.attachment')
         pool_gdoc_config = self.pool.get('google.docs.config')
-        name_gdocs = ''
-        model_fields_dic = self.pool.get(res_model).read(cr, uid, res_id, [], context=context)
 
-        # check if a model is configured with a template
-        google_docs_config = pool_gdoc_config.search(cr, uid, [('model_id', '=', res_model)], context=context)
-        if google_docs_config:
-            name_gdocs = pool_gdoc_config.browse(cr, uid, google_docs_config, context=context)[0].name_template
-            try:
-                name_gdocs = name_gdocs % model_fields_dic
-            except:
-                raise osv.except_osv(_('Key Error!'), _("Your Google Drive Name Pattern's key does not found in object."))
-            google_template_id = pool_gdoc_config.browse(cr, uid, google_docs_config[0], context=context).gdocs_resource_id
-            google_document = pool_ir_attachment.copy_gdoc(cr, uid, res_model, res_id, name_gdocs, google_template_id, context=context)
-        else:
-            google_document = pool_ir_attachment.create_empty_google_doc(cr, uid, res_model, res_id, context=context)
-        return google_document
+        config_ids = pool_gdoc_config.search(cr, uid, [('model_id', '=', res_model)], context=context)
+        config = []
+        for config_id in config_ids:
+            action = pool_gdoc_config.browse(cr, uid, config_id, context=context)
+            if action.filter_id:
+                google_doc_configs = self._filt(cr, uid, action, action.filter_id, res_id, context=context)
+                print google_doc_configs,'rrrrrrrrrrr',res_id
+                if google_doc_configs: 
+                    config.append(action.name_template)
+            else:
+                config.append(action.name_template)
+        return config
+    
+    def _filt(self, cr, uid, action, action_filter, record_ids, context=None):
+        """ filter the list record_ids that satisfy the action filter """
+        records = {}
+        if record_ids and action_filter:
+            assert action.model_id.model == action_filter.model_id, "Filter model different from action rule model"
+            print 'aaction_filter',action_filter.model_id
+            model = self.pool.get(action_filter.model_id)
+            domain = [('id', 'in', [record_ids])] + eval(action_filter.domain)
+            ctx = dict(context or {})
+            ctx.update(eval(action_filter.context))
+            print 'domain---------',domain 
+            record_ids = model.search(cr, uid, domain, context=ctx)
+        return record_ids
+    
+    def get_attachment(self, cr, uid, res_model, rec_name, ids, context=None):
+        res_id = ids[0]
+        pool_gdoc_config = self.pool.get('google.docs.config')
+        action_dom = [('model_id', '=', res_model)]
+        config_ids = pool_gdoc_config.search(cr, uid, action_dom, context=context)[0]
+        action = pool_gdoc_config.browse(cr, uid, config_ids, context=context)
+        attachment = {}
+        attach_ids = self.search(cr, uid, [('res_model','=',res_model),('name','=',action.name_template),('res_id','=',res_id)])
+        if not attach_ids: 
+            google_template_id = action.gdocs_resource_id
+            self.copy_gdoc(cr, uid, action.model_id.model, ids[0], action.name_template, google_template_id, context=context)
+            attach_ids = self.search(cr, uid, [('res_model','=',res_model),('name','=',action.name_template)])
+        attachments =  self.browse(cr, uid, attach_ids, context)[0]
+        attachment['url'] = attachments.url
+        return attachment
 
 class config(osv.osv):
     _name = 'google.docs.config'
@@ -200,138 +226,148 @@ class config(osv.osv):
         '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),
     }
 
-    def onchange_model_id(self, cr, uid, ids, model_id):
+    def onchange_model_id(self, cr, uid, ids, model_id,name_template):
         res = {'domain':{'filter_id':[]}}
         if model_id:
-            model_name = self.pool.get('ir.model').read(cr, uid, model_id, ['model'])
-            if model_name:
-                mod_name = model_name['model']
-                res['domain'] = {'filter_id': [('model_id', '=', mod_name)]}
-        else:
-            res['value'] = {'filter_id': False}
+            model_name = self.pool.get('ir.model').read(cr, uid, model_id, ['model','name'])
+            mod_model = model_name['model']
+            mod_name = model_name['name']
+            res['domain'] = {'filter_id': [('model_id', '=', mod_model)]}
+            mod_name = model_name['name']
+            name = name_template.replace('model', mod_name)
+            res['value'] = {'filter_id': False,'name_template': name or False}
         return res
+    
+    def onchange_filter_id(self, cr, uid, ids,model_id,filter_id,name_template):
+        res = {}
+        if filter_id:
+            filter_name = self.pool.get('ir.filters').browse(cr, uid, filter_id)
+            name = name_template.replace('filter',filter_name.name)
+        res['value'] = {'name_template': name or False}
+        return res
+    
 
     _defaults = {
         'name_template': '%(name)s_model_filter_gdoc',
     }
 
-    def _wrap_create(self, old_create, model):
-        """ Return a wrapper around `old_create` calling both `old_create` and
-            `_process`, in that order.
-        """
-        def wrapper(cr, uid, vals, context=None):
-            # avoid loops or cascading actions
-            
-            if context and context.get('action'):
-                return old_create(cr, uid, vals, context=context)
-            
-            context = dict(context or {}, action=True)
-            new_id = old_create(cr, uid, vals, context=context)
-            
-            # as it is a new record, we do not consider the actions that have a prefilter
-            action_dom = [('model_id', '=', model)]
-            config_ids = self.search(cr, uid, action_dom, context=context)
+#    def _wrap_create(self, old_create, model):
+#        """ Return a wrapper around `old_create` calling both `old_create` and
+#            `_process`, in that order.
+#        """
+#        def wrapper(cr, uid, vals, context=None):
+#            # avoid loops or cascading actions
+#            
+#            if context and context.get('action'):
+#                return old_create(cr, uid, vals, context=context)
+#            
+#            context = dict(context or {}, action=True)
+#            new_id = old_create(cr, uid, vals, context=context)
+#            
+#            # as it is a new record, we do not consider the actions that have a prefilter
+#            action_dom = [('model_id', '=', model)]
+#            config_ids = self.search(cr, uid, action_dom, context=context)
+##            # check postconditions, and execute actions on the records that satisfy them
+#            for action in self.browse(cr, uid, config_ids, context=context):
+#                if self._filter(cr, uid, action, action.filter_id, [new_id], context=context):
+#                    self._process(cr, uid, action, [new_id], context=context)
+#            return new_id
+#
+#        return wrapper
+#    
+#    def _filter(self, cr, uid, action, action_filter, record_ids, context=None):
+#        """ filter the list record_ids that satisfy the action filter """
+#        if record_ids and action_filter:
+#            assert action.model_id.model == action_filter.model_id, "Filter model different from action rule model"
+#            model = self.pool.get(action_filter.model_id)
+#            domain = [('id', 'in', record_ids)] + eval(action_filter.domain)
+#            ctx = dict(context or {})
+#            ctx.update(eval(action_filter.context)) 
+#            record_ids = model.search(cr, uid, domain, context=ctx)
+#        return record_ids
+#    
+#    def _process(self, cr, uid, action, record_ids, context=None):
+#        """ process the given action on the records """
+#        # execute server actions
+#        model = self.pool.get(action.model_id.model)
+#        template_url = action.gdocs_template_url
+#        attach_obj = self.pool.get('ir.attachment')
+#        for record_id in record_ids:
+#            record_id = int(record_id)
+#            model_fields_dic = self.pool.get(action.model_id.model).read(cr, uid, record_id, [], context=context)
+#            name_gdocs = action.name_template
+#            name_gdocs = name_gdocs.replace('model',action.model_id.name)
+#            if action.filter_id:
+#                name_gdocs = name_gdocs.replace('filter',action.filter_id.name)
+#            try:
+#                name_gdocs = name_gdocs % model_fields_dic
+#            except:
+#                raise osv.except_osv(_('Key Error!'), _("Your Google Drive Name Pattern's key does not found in object."))
+#            attachments = attach_obj.search(cr, uid, [('res_id','=',record_id),('name','=',name_gdocs)])
+#            if not attachments:
+#                google_template_id = action.gdocs_resource_id
+#                attach_obj.copy_gdoc(cr, uid, action.model_id.model, record_id, name_gdocs, google_template_id, context=context)
+#        return True
+#
+#    def _wrap_write(self, old_write, model):
+#        """ Return a wrapper around `old_write` calling both `old_write` and
+#            `_process`, in that order.
+#        """
+#        def wrapper(cr, uid, ids, vals, context=None):
+#            # avoid loops or cascading actions
+#            if context and context.get('action'):
+#                return old_write(cr, uid, ids, vals, context=context)
+#
+#            context = dict(context or {}, action=True)
+#            ids = [ids] if isinstance(ids, (int, long, str)) else ids
+#
+#            # retrieve the action rules to possibly execute
+#            action_dom = [('model_id', '=', model)]
+#            config_ids = self.search(cr, uid, action_dom, context=context)
+#            gconfigs = self.browse(cr, uid, config_ids, context=context)
+#
+#            # check preconditions
+#            pre_ids = {}
+#            for gconfig in gconfigs:
+#                pre_ids[gconfig] = self._filter(cr, uid, gconfig, gconfig.filter_id, ids, context=context)
+#
+#            # execute write
+#            old_write(cr, uid, ids, vals, context=context)
+#
 #            # check postconditions, and execute actions on the records that satisfy them
-            for action in self.browse(cr, uid, config_ids, context=context):
-                if self._filter(cr, uid, action, action.filter_id, [new_id], context=context):
-                    self._process(cr, uid, action, [new_id], context=context)
-            return new_id
-
-        return wrapper
-    
-    def _filter(self, cr, uid, action, action_filter, record_ids, context=None):
-        """ filter the list record_ids that satisfy the action filter """
-        if record_ids and action_filter:
-            assert action.model_id.model == action_filter.model_id, "Filter model different from action rule model"
-            model = self.pool.get(action_filter.model_id)
-            domain = [('id', 'in', record_ids)] + eval(action_filter.domain)
-            ctx = dict(context or {})
-            ctx.update(eval(action_filter.context)) 
-            record_ids = model.search(cr, uid, domain, context=ctx)
-        return record_ids
-    
-    def _process(self, cr, uid, action, record_ids, context=None):
-        """ process the given action on the records """
-        # execute server actions
-        model = self.pool.get(action.model_id.model)
-        template_url = action.gdocs_template_url
-        attach_obj = self.pool.get('ir.attachment')
-        for record_id in record_ids:
-            record_id = int(record_id)
-            model_fields_dic = self.pool.get(action.model_id.model).read(cr, uid, record_id, [], context=context)
-            name_gdocs = action.name_template
-            name_gdocs = name_gdocs.replace('model',action.model_id.name)
-            if action.filter_id:
-                name_gdocs = name_gdocs.replace('filter',action.filter_id.name)
-            try:
-                name_gdocs = name_gdocs % model_fields_dic
-            except:
-                raise osv.except_osv(_('Key Error!'), _("Your Google Drive Name Pattern's key does not found in object."))
-            attachments = attach_obj.search(cr, uid, [('res_id','=',record_id),('name','=',name_gdocs)])
-            if not attachments:
-                google_template_id = action.gdocs_resource_id
-                attach_obj.copy_gdoc(cr, uid, action.model_id.model, record_id, name_gdocs, google_template_id, context=context)
-        return True
-
-    def _wrap_write(self, old_write, model):
-        """ Return a wrapper around `old_write` calling both `old_write` and
-            `_process`, in that order.
-        """
-        def wrapper(cr, uid, ids, vals, context=None):
-            # avoid loops or cascading actions
-            if context and context.get('action'):
-                return old_write(cr, uid, ids, vals, context=context)
-
-            context = dict(context or {}, action=True)
-            ids = [ids] if isinstance(ids, (int, long, str)) else ids
-
-            # retrieve the action rules to possibly execute
-            action_dom = [('model_id', '=', model)]
-            config_ids = self.search(cr, uid, action_dom, context=context)
-            gconfigs = self.browse(cr, uid, config_ids, context=context)
-
-            # check preconditions
-            pre_ids = {}
-            for gconfig in gconfigs:
-                pre_ids[gconfig] = self._filter(cr, uid, gconfig, gconfig.filter_id, ids, context=context)
-
-            # execute write
-            old_write(cr, uid, ids, vals, context=context)
-
-            # check postconditions, and execute actions on the records that satisfy them
-            for gconfig in gconfigs:
-                post_ids = self._filter(cr, uid, gconfig, gconfig.filter_id, pre_ids[gconfig], context=context)
-                print 'post_idsss',post_ids
-                if post_ids:
-                    print 'post_idsss',post_ids
-                    self._process(cr, uid, gconfig, post_ids, context=context)
-            return True
-
-        return wrapper
-
-    def _register_hook(self, cr, ids=None):
-        """ Wrap the methods `create` and `write` of the models specified by
-            the rules given by `ids` (or all existing rules if `ids` is `None`.)
-        """
-        if ids is None:
-            ids = self.search(cr, SUPERUSER_ID, [])
-        for config in self.browse(cr, SUPERUSER_ID, ids):
-            model = config.model_id.model
-            model_obj = self.pool.get(model)
-            model_obj.create = self._wrap_create(model_obj.create, model)
-            model_obj.write = self._wrap_write(model_obj.write, model)
-        return True
-
-    def create(self, cr, uid, vals, context=None):
-        res_id = super(config, self).create(cr, uid, vals, context=context)
-        self._register_hook(cr, [res_id])
-        return res_id
-
-    def write(self, cr, uid, ids, vals, context=None):
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        super(config, self).write(cr, uid, ids, vals, context=context)
-        self._register_hook(cr, ids)
-        return True
+#            for gconfig in gconfigs:
+#                post_ids = self._filter(cr, uid, gconfig, gconfig.filter_id, pre_ids[gconfig], context=context)
+#                print 'post_idsss',post_ids
+#                if post_ids:
+#                    print 'post_idsss',post_ids
+#                    self._process(cr, uid, gconfig, post_ids, context=context)
+#            return True
+#
+#        return wrapper
+#
+#    def _register_hook(self, cr, ids=None):
+#        """ Wrap the methods `create` and `write` of the models specified by
+#            the rules given by `ids` (or all existing rules if `ids` is `None`.)
+#        """
+#        if ids is None:
+#            ids = self.search(cr, SUPERUSER_ID, [])
+#        for config in self.browse(cr, SUPERUSER_ID, ids):
+#            model = config.model_id.model
+#            model_obj = self.pool.get(model)
+#            model_obj.create = self._wrap_create(model_obj.create, model)
+#            model_obj.write = self._wrap_write(model_obj.write, model)
+#        return True
+#
+#    def create(self, cr, uid, vals, context=None):
+#        res_id = super(config, self).create(cr, uid, vals, context=context)
+#        self._register_hook(cr, [res_id])
+#        return res_id
+#
+#    def write(self, cr, uid, ids, vals, context=None):
+#        if isinstance(ids, (int, long)):
+#            ids = [ids]
+#        super(config, self).write(cr, uid, ids, vals, context=context)
+#        self._register_hook(cr, ids)
+#        return True
 
 config()
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 83d5a1ef84f..bdcb665e64e 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -21,10 +21,10 @@
             <field name="arch" type="xml">
                 <form string="Google Drive Configuration" version="7.0">
                 <group>
-                    <field name="model_id" on_change="onchange_model_id(model_id)"/>
+                    <field name="model_id" on_change="onchange_model_id(model_id,name_template)"/>
                     <label for='filter_id'/>
                     <div>
-                        <field name='filter_id'/>
+                        <field name='filter_id' on_change="onchange_filter_id(model_id,filter_id,name_template)"/>
                         <p class="oe_grey">
 					To Create a new filter, go to the list of documents you want to attach a google document to and 
 					save the filter.Then come back ti this view.The saved filter will be available in the filed above.
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 1cc511ef4d9..a0f1cba3b9b 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -3,38 +3,64 @@ var _t = instance.web._t,
     QWeb = instance.web.qweb;
 
     instance.web.Sidebar.include({
-        redraw: function() {
+    	
+    	start: function() {
             var self = this;
+            var ids 
             this._super.apply(this, arguments);
-            self.$el.find('.oe_sidebar_add_attachment').after(QWeb.render('AddGoogleDocumentItem', {widget: self}))
-            self.$el.find('.oe_sidebar_add_google_doc').on('click', function (e) {
-                self.on_google_doc();
-            });
-        },
-        on_google_doc: function() {
-            var self = this;
             var view = self.getParent();
-            var ids = ( view.fields_view.type != "form" )? view.groups.get_selection().ids : [ view.datarecord.id ];
-            if( !_.isEmpty(ids) ){
-                view.sidebar_eval_context().done(function (context) {
-                    var ds = new instance.web.DataSet(this, 'ir.attachment', context);
-                    ds.call('google_doc_get', [view.dataset.model, ids, context]).done(function(r) {
-                        if (r == 'False') {
-                            var params = {
-                                error: response,
-                                message: _t("The user google credentials are not set yet. Contact your administrator for help.")
-                            }
-                            $(openerp.web.qweb.render("DialogWarning", params)).dialog({
-                                title: _t("User Google credentials are not yet set."),
-                                modal: true,
-                            });
-                        }
-                    }).done(function(r){
-                        window.open(r.url,"_blank");
-                        view.reload();
-                    });
-                });
-            }
-        }
+            var result;
+            if(view.fields_view.type == "form"){
+            	ids = []
+            	view.on("load_record", self, function(r){
+		            	ids = [r.id]
+		            	self.add_gdoc_items(view,ids)
+            		});
+            	}
+        	},
+        
+	        add_gdoc_items: function(view,ids){
+	        	$('.oe_share_gdoc').remove();
+	        	var self = this;
+	        	if( !_.isEmpty(ids) ){
+	                view.sidebar_eval_context().done(function (context) {
+		            var ds = new instance.web.DataSet(this, 'ir.attachment', context);
+		            ds.call('google_doc_get', [view.dataset.model, ids, context]).done(function(r) {
+		            	console.log("thjoid ",self.items['other'])
+		            	if(!_.isEmpty(r)){
+		            	_.each(r,function(res){
+		            		_.each(self.items['other'],function(others){
+		            			if(others['label'] == res){
+		            				self.items['other'].pop()
+		            			}
+		            		})
+		            		self.add_items('other', [
+		                    {   label: res,
+		                        callback: self.on_google_doc,
+		                        classname: 'oe_share_gdoc' },
+		                	]);
+		            	  })
+		               }
+		              });
+		            });
+		         }
+	        },
+        
+	        on_google_doc: function(r) {
+	            var self = this;
+	            var view = self.getParent();
+	            var ids = ( view.fields_view.type != "form" )? view.groups.get_selection().ids : [ view.datarecord.id ];
+	            if( !_.isEmpty(ids) ){
+	                view.sidebar_eval_context().done(function (context) {
+	                    var ds = new instance.web.DataSet(this, 'ir.attachment', context);
+	                    ds.call('get_attachment', [view.dataset.model, r, ids, context]).done(function(res) {
+	                        console.log('resssssss',res)
+	                        window.open(res.url,"_blank");
+	                        view.reload();
+	                    })
+	                    	
+	                });
+	            }
+	        }
     });
 };
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_docs/static/src/xml/gdocs.xml
index e0cfd5cf25c..a90f4034ea8 100644
--- a/addons/google_docs/static/src/xml/gdocs.xml
+++ b/addons/google_docs/static/src/xml/gdocs.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- vim:fdl=1:
 -->
-<templates id="template" xml:space="preserve">
+<!-- <templates id="template" xml:space="preserve">
 <t t-name="AddGoogleDocumentItem">
-     <li class="oe_sidebar_add_google_doc"><span><b>Add Google Drive...</b></span></li>
+	 <t t-foreach="widget" t-as="item">
+	 		<li class="oe_gdoc_action_a"><span><t t-esc="item"/></span></li>
+     </t>
 </t>
-</templates>
+</templates> -->
\ No newline at end of file

From 4970a21c7f4d757c1b75cc37e04bccece70391bd Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Mon, 11 Mar 2013 16:56:49 +0530
Subject: [PATCH 13/61] [Imp]Removing the virtual item while moving to next
 record

bzr revid: dhr@tinyerp.com-20130311112649-wzt7n8h718g7cabv
---
 addons/google_docs/__openerp__.py         |  2 +-
 addons/google_docs/static/src/js/gdocs.js | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index f804ecc99b4..ca51719d185 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -28,7 +28,7 @@
     'installable': True,
     'auto_install': False,
     'js': ['static/src/js/gdocs.js'],
-    'qweb': ['static/src/xml/gdocs.xml'],
+#    'qweb': ['static/src/xml/gdocs.xml'],
     'data': [
         'security/ir.model.access.csv',
         'res_config_user_view.xml'
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index a0f1cba3b9b..e5461e2c919 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -19,21 +19,25 @@ var _t = instance.web._t,
             	}
         	},
         
-	        add_gdoc_items: function(view,ids){
-	        	$('.oe_share_gdoc').remove();
+	      add_gdoc_items: function(view,ids){
 	        	var self = this;
+	        	var gdoc_item = _.indexOf(_.pluck(self.items.other,'classname'),'oe_share_gdoc');
+	        	if(gdoc_item !== -1)
+	        	{
+	        		self.items.other.splice(gdoc_item,1);
+	        	}
 	        	if( !_.isEmpty(ids) ){
 	                view.sidebar_eval_context().done(function (context) {
 		            var ds = new instance.web.DataSet(this, 'ir.attachment', context);
 		            ds.call('google_doc_get', [view.dataset.model, ids, context]).done(function(r) {
-		            	console.log("thjoid ",self.items['other'])
 		            	if(!_.isEmpty(r)){
 		            	_.each(r,function(res){
-		            		_.each(self.items['other'],function(others){
-		            			if(others['label'] == res){
-		            				self.items['other'].pop()
-		            			}
-		            		})
+		            		var g_item = _.indexOf(_.pluck(self.items.other,'label'),res);
+				        	if(g_item !== -1)
+				        	{
+				        		self.items.other.splice(g_item,1);
+				        	}
+				   
 		            		self.add_items('other', [
 		                    {   label: res,
 		                        callback: self.on_google_doc,
@@ -46,6 +50,7 @@ var _t = instance.web._t,
 		         }
 	        },
         
+        
 	        on_google_doc: function(r) {
 	            var self = this;
 	            var view = self.getParent();
@@ -54,7 +59,6 @@ var _t = instance.web._t,
 	                view.sidebar_eval_context().done(function (context) {
 	                    var ds = new instance.web.DataSet(this, 'ir.attachment', context);
 	                    ds.call('get_attachment', [view.dataset.model, r, ids, context]).done(function(res) {
-	                        console.log('resssssss',res)
 	                        window.open(res.url,"_blank");
 	                        view.reload();
 	                    })

From a0585bf07c1a7b5995a6fe0b5ad6b5a7964c3048 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Mon, 11 Mar 2013 18:59:29 +0530
Subject: [PATCH 14/61] [IMP]Adding name field and displaying message for empty
 list

bzr revid: dhr@tinyerp.com-20130311132929-0pw8rtaxyj8ke9tx
---
 addons/google_docs/google_docs.py           | 134 ++------------------
 addons/google_docs/google_docs_demo.xml     |   3 +-
 addons/google_docs/res_config_user_view.xml |   9 ++
 3 files changed, 19 insertions(+), 127 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index dd5b7f0ecc6..71d3e84a21d 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -111,7 +111,7 @@ class google_docs_ir_attachment(osv.osv):
 #                'title': title,
 #                'url': gdocs_resource.get_alternate_link().href}
 
-    def copy_gdoc(self, cr, uid, res_model, res_id, name_gdocs, gdoc_template_id, context=None):
+    def copy_gdoc(self, cr, uid, res_model, res_id, name_gdocs,name, gdoc_template_id, context=None):
         '''
         copy an existing document in google docs
            :param res_model: the object for which the google doc is created
@@ -134,7 +134,7 @@ class google_docs_ir_attachment(osv.osv):
             'res_model': res_model,
             'res_id': res_id,
             'type': 'url',
-            'name': name_gdocs,
+            'name': name,
             'url': copy_resource.get_alternate_link().href
         }, context=context)
         return copy_resource.resource_id.text
@@ -164,9 +164,9 @@ class google_docs_ir_attachment(osv.osv):
                 google_doc_configs = self._filt(cr, uid, action, action.filter_id, res_id, context=context)
                 print google_doc_configs,'rrrrrrrrrrr',res_id
                 if google_doc_configs: 
-                    config.append(action.name_template)
+                    config.append(action.name)
             else:
-                config.append(action.name_template)
+                config.append(action.name)
         return config
     
     def _filt(self, cr, uid, action, action_filter, record_ids, context=None):
@@ -190,11 +190,11 @@ class google_docs_ir_attachment(osv.osv):
         config_ids = pool_gdoc_config.search(cr, uid, action_dom, context=context)[0]
         action = pool_gdoc_config.browse(cr, uid, config_ids, context=context)
         attachment = {}
-        attach_ids = self.search(cr, uid, [('res_model','=',res_model),('name','=',action.name_template),('res_id','=',res_id)])
+        attach_ids = self.search(cr, uid, [('res_model','=',res_model),('name','=',action.name),('res_id','=',res_id)])
         if not attach_ids: 
             google_template_id = action.gdocs_resource_id
-            self.copy_gdoc(cr, uid, action.model_id.model, ids[0], action.name_template, google_template_id, context=context)
-            attach_ids = self.search(cr, uid, [('res_model','=',res_model),('name','=',action.name_template)])
+            self.copy_gdoc(cr, uid, action.model_id.model, ids[0], action.name_template, action.name, google_template_id, context=context)
+            attach_ids = self.search(cr, uid, [('res_model','=',res_model),('name','=',action.name)])
         attachments =  self.browse(cr, uid, attach_ids, context)[0]
         attachment['url'] = attachments.url
         return attachment
@@ -219,6 +219,7 @@ class config(osv.osv):
         return result
 
     _columns = {
+        'name' : fields.char('Name', required=True, size=1024),
         'model_id': fields.many2one('ir.model', 'Model', required=True),
         'filter_id' : fields.many2one('ir.filters', 'Filter'),
         'gdocs_template_url': fields.char('Template Url', required=True, size=1024),
@@ -251,123 +252,4 @@ class config(osv.osv):
         'name_template': '%(name)s_model_filter_gdoc',
     }
 
-#    def _wrap_create(self, old_create, model):
-#        """ Return a wrapper around `old_create` calling both `old_create` and
-#            `_process`, in that order.
-#        """
-#        def wrapper(cr, uid, vals, context=None):
-#            # avoid loops or cascading actions
-#            
-#            if context and context.get('action'):
-#                return old_create(cr, uid, vals, context=context)
-#            
-#            context = dict(context or {}, action=True)
-#            new_id = old_create(cr, uid, vals, context=context)
-#            
-#            # as it is a new record, we do not consider the actions that have a prefilter
-#            action_dom = [('model_id', '=', model)]
-#            config_ids = self.search(cr, uid, action_dom, context=context)
-##            # check postconditions, and execute actions on the records that satisfy them
-#            for action in self.browse(cr, uid, config_ids, context=context):
-#                if self._filter(cr, uid, action, action.filter_id, [new_id], context=context):
-#                    self._process(cr, uid, action, [new_id], context=context)
-#            return new_id
-#
-#        return wrapper
-#    
-#    def _filter(self, cr, uid, action, action_filter, record_ids, context=None):
-#        """ filter the list record_ids that satisfy the action filter """
-#        if record_ids and action_filter:
-#            assert action.model_id.model == action_filter.model_id, "Filter model different from action rule model"
-#            model = self.pool.get(action_filter.model_id)
-#            domain = [('id', 'in', record_ids)] + eval(action_filter.domain)
-#            ctx = dict(context or {})
-#            ctx.update(eval(action_filter.context)) 
-#            record_ids = model.search(cr, uid, domain, context=ctx)
-#        return record_ids
-#    
-#    def _process(self, cr, uid, action, record_ids, context=None):
-#        """ process the given action on the records """
-#        # execute server actions
-#        model = self.pool.get(action.model_id.model)
-#        template_url = action.gdocs_template_url
-#        attach_obj = self.pool.get('ir.attachment')
-#        for record_id in record_ids:
-#            record_id = int(record_id)
-#            model_fields_dic = self.pool.get(action.model_id.model).read(cr, uid, record_id, [], context=context)
-#            name_gdocs = action.name_template
-#            name_gdocs = name_gdocs.replace('model',action.model_id.name)
-#            if action.filter_id:
-#                name_gdocs = name_gdocs.replace('filter',action.filter_id.name)
-#            try:
-#                name_gdocs = name_gdocs % model_fields_dic
-#            except:
-#                raise osv.except_osv(_('Key Error!'), _("Your Google Drive Name Pattern's key does not found in object."))
-#            attachments = attach_obj.search(cr, uid, [('res_id','=',record_id),('name','=',name_gdocs)])
-#            if not attachments:
-#                google_template_id = action.gdocs_resource_id
-#                attach_obj.copy_gdoc(cr, uid, action.model_id.model, record_id, name_gdocs, google_template_id, context=context)
-#        return True
-#
-#    def _wrap_write(self, old_write, model):
-#        """ Return a wrapper around `old_write` calling both `old_write` and
-#            `_process`, in that order.
-#        """
-#        def wrapper(cr, uid, ids, vals, context=None):
-#            # avoid loops or cascading actions
-#            if context and context.get('action'):
-#                return old_write(cr, uid, ids, vals, context=context)
-#
-#            context = dict(context or {}, action=True)
-#            ids = [ids] if isinstance(ids, (int, long, str)) else ids
-#
-#            # retrieve the action rules to possibly execute
-#            action_dom = [('model_id', '=', model)]
-#            config_ids = self.search(cr, uid, action_dom, context=context)
-#            gconfigs = self.browse(cr, uid, config_ids, context=context)
-#
-#            # check preconditions
-#            pre_ids = {}
-#            for gconfig in gconfigs:
-#                pre_ids[gconfig] = self._filter(cr, uid, gconfig, gconfig.filter_id, ids, context=context)
-#
-#            # execute write
-#            old_write(cr, uid, ids, vals, context=context)
-#
-#            # check postconditions, and execute actions on the records that satisfy them
-#            for gconfig in gconfigs:
-#                post_ids = self._filter(cr, uid, gconfig, gconfig.filter_id, pre_ids[gconfig], context=context)
-#                print 'post_idsss',post_ids
-#                if post_ids:
-#                    print 'post_idsss',post_ids
-#                    self._process(cr, uid, gconfig, post_ids, context=context)
-#            return True
-#
-#        return wrapper
-#
-#    def _register_hook(self, cr, ids=None):
-#        """ Wrap the methods `create` and `write` of the models specified by
-#            the rules given by `ids` (or all existing rules if `ids` is `None`.)
-#        """
-#        if ids is None:
-#            ids = self.search(cr, SUPERUSER_ID, [])
-#        for config in self.browse(cr, SUPERUSER_ID, ids):
-#            model = config.model_id.model
-#            model_obj = self.pool.get(model)
-#            model_obj.create = self._wrap_create(model_obj.create, model)
-#            model_obj.write = self._wrap_write(model_obj.write, model)
-#        return True
-#
-#    def create(self, cr, uid, vals, context=None):
-#        res_id = super(config, self).create(cr, uid, vals, context=context)
-#        self._register_hook(cr, [res_id])
-#        return res_id
-#
-#    def write(self, cr, uid, ids, vals, context=None):
-#        if isinstance(ids, (int, long)):
-#            ids = [ids]
-#        super(config, self).write(cr, uid, ids, vals, context=context)
-#        self._register_hook(cr, ids)
-#        return True
-
 config()
diff --git a/addons/google_docs/google_docs_demo.xml b/addons/google_docs/google_docs_demo.xml
index d41f755e55f..b679b749c9b 100644
--- a/addons/google_docs/google_docs_demo.xml
+++ b/addons/google_docs/google_docs_demo.xml
@@ -13,10 +13,11 @@
 
 <!-- template demo -->
       <record id="template_crm" model="google.docs.config">
+      	  <field name="name">Sales Department Opportunities</field>
           <field name="model_id" ref="crm.model_crm_lead"/>
           <field name="filter_id" ref="filter_crm"/>
           <field name="gdocs_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
-          <field name="name_template">lead_sales-department_%(name)s_review</field>
+          <field name="name_template">lead_sales-department_%%(name)s_review</field>
       </record>
       
     </data>
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index bdcb665e64e..1a44d188a5c 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -21,6 +21,7 @@
             <field name="arch" type="xml">
                 <form string="Google Drive Configuration" version="7.0">
                 <group>
+                	<field name="name"/>
                     <field name="model_id" on_change="onchange_model_id(model_id,name_template)"/>
                     <label for='filter_id'/>
                     <div>
@@ -55,6 +56,14 @@
             <field name='type'>ir.actions.act_window</field>
             <field name='view_type'>form</field>
             <field name='view_id' ref='view_google_docs_config_tree'/>
+            <field name="help" type="html">
+              <p>
+               "Link your first Google document to openERP documents
+                You use to control the quality of your product in a spreadheet ?
+                You review the delivery checklist for each delivery order in a  foreign country ? ...
+                Link your own templates on any documents of OpenERP
+              </p>
+            </field>
         </record>
 
         <record id="inherited_google_view_general_configuration" model="ir.ui.view">

From 83767b0f3eb4883195b250f81c7c68516fc16201 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Tue, 12 Mar 2013 15:02:39 +0530
Subject: [PATCH 15/61] [IMP]Changed code for name template

bzr revid: dhr@tinyerp.com-20130312093239-l012shts2q80bd66
---
 addons/google_docs/google_docs.py           | 54 ++++++++++-----------
 addons/google_docs/res_config_user_view.xml |  4 +-
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 71d3e84a21d..b72943c750d 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -162,7 +162,6 @@ class google_docs_ir_attachment(osv.osv):
             action = pool_gdoc_config.browse(cr, uid, config_id, context=context)
             if action.filter_id:
                 google_doc_configs = self._filt(cr, uid, action, action.filter_id, res_id, context=context)
-                print google_doc_configs,'rrrrrrrrrrr',res_id
                 if google_doc_configs: 
                     config.append(action.name)
             else:
@@ -174,27 +173,38 @@ class google_docs_ir_attachment(osv.osv):
         records = {}
         if record_ids and action_filter:
             assert action.model_id.model == action_filter.model_id, "Filter model different from action rule model"
-            print 'aaction_filter',action_filter.model_id
             model = self.pool.get(action_filter.model_id)
             domain = [('id', 'in', [record_ids])] + eval(action_filter.domain)
             ctx = dict(context or {})
             ctx.update(eval(action_filter.context))
-            print 'domain---------',domain 
             record_ids = model.search(cr, uid, domain, context=ctx)
         return record_ids
     
     def get_attachment(self, cr, uid, res_model, rec_name, ids, context=None):
         res_id = ids[0]
         pool_gdoc_config = self.pool.get('google.docs.config')
-        action_dom = [('model_id', '=', res_model)]
-        config_ids = pool_gdoc_config.search(cr, uid, action_dom, context=context)[0]
+        config_ids = pool_gdoc_config.search(cr, uid, [('model_id', '=', res_model)], context=context)[0]
         action = pool_gdoc_config.browse(cr, uid, config_ids, context=context)
         attachment = {}
+        model_fields_dic = self.pool.get(res_model).read(cr, uid, res_id, [], context=context)
+        # check if a model is configured with a template
+        if config_ids:
+            name_gdocs = action.name_template
+            print 'name_gdocss',name_gdocs
+            try:
+                if name_gdocs.find('model')!=-1:
+                    name_gdocs = name_gdocs.replace('model',action.model_id.name)
+                if name_gdocs.find('filter')!=-1:
+                    name_gdocs = name_gdocs.replace('filter',action.filter_id.name)
+                name_gdocs = name_gdocs % model_fields_dic
+            except:
+                raise osv.except_osv(_('Key Error!'), _("Your Google Doc Name Pattern's key does not found in object."))
+        
         attach_ids = self.search(cr, uid, [('res_model','=',res_model),('name','=',action.name),('res_id','=',res_id)])
         if not attach_ids: 
             google_template_id = action.gdocs_resource_id
-            self.copy_gdoc(cr, uid, action.model_id.model, ids[0], action.name_template, action.name, google_template_id, context=context)
-            attach_ids = self.search(cr, uid, [('res_model','=',res_model),('name','=',action.name)])
+            self.copy_gdoc(cr, uid, action.model_id.model, res_id, name_gdocs, action.name, google_template_id, context=context)
+            attach_ids = self.search(cr, uid, [('res_model','=',res_model),('name','=',action.name),('res_id','=',res_id)])
         attachments =  self.browse(cr, uid, attach_ids, context)[0]
         attachment['url'] = attachments.url
         return attachment
@@ -227,26 +237,16 @@ class config(osv.osv):
         '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),
     }
 
-    def onchange_model_id(self, cr, uid, ids, model_id,name_template):
-        res = {'domain':{'filter_id':[]}}
-        if model_id:
-            model_name = self.pool.get('ir.model').read(cr, uid, model_id, ['model','name'])
-            mod_model = model_name['model']
-            mod_name = model_name['name']
-            res['domain'] = {'filter_id': [('model_id', '=', mod_model)]}
-            mod_name = model_name['name']
-            name = name_template.replace('model', mod_name)
-            res['value'] = {'filter_id': False,'name_template': name or False}
-        return res
-    
-    def onchange_filter_id(self, cr, uid, ids,model_id,filter_id,name_template):
-        res = {}
-        if filter_id:
-            filter_name = self.pool.get('ir.filters').browse(cr, uid, filter_id)
-            name = name_template.replace('filter',filter_name.name)
-        res['value'] = {'name_template': name or False}
-        return res
-    
+    def onchange_model_id(self, cr, uid, ids, model_id):
+         res = {'domain':{'filter_id':[]}}
+         if model_id:
+             model_name = self.pool.get('ir.model').read(cr, uid, model_id, ['model'])
+             if model_name:
+                 mod_name = model_name['model']
+                 res['domain'] = {'filter_id': [('model_id', '=', mod_name)]}
+         else:
+             res['value'] = {'filter_id': False}
+         return res
 
     _defaults = {
         'name_template': '%(name)s_model_filter_gdoc',
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 1a44d188a5c..2b1f1c1730a 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -22,10 +22,10 @@
                 <form string="Google Drive Configuration" version="7.0">
                 <group>
                 	<field name="name"/>
-                    <field name="model_id" on_change="onchange_model_id(model_id,name_template)"/>
+                    <field name="model_id" on_change="onchange_model_id(model_id)"/>
                     <label for='filter_id'/>
                     <div>
-                        <field name='filter_id' on_change="onchange_filter_id(model_id,filter_id,name_template)"/>
+                        <field name='filter_id'/>
                         <p class="oe_grey">
 					To Create a new filter, go to the list of documents you want to attach a google document to and 
 					save the filter.Then come back ti this view.The saved filter will be available in the filed above.

From 307057a3176e711858dad4318da57f64ef63badc Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Mon, 18 Mar 2013 14:40:40 +0530
Subject: [PATCH 16/61] [IMP]Changed Module description and added document to
 the dependency

bzr revid: dhr@tinyerp.com-20130318091040-z40al4lt5t9vle2s
---
 addons/google_docs/__openerp__.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index ca51719d185..8d16a78a371 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -36,9 +36,13 @@
     'demo': [
         'google_docs_demo.xml'
     ],
-    'depends': ['google_base_account','crm'],
+    'depends': ['google_base_account','crm','document'],
     'description': """
-Module to attach a google document to any model.
-================================================
+Integrate Google document with OpenERP.
+=======================================
+
+This module is used to integrate google document to OpenERP record.
+
+You can configure google accounts from Settings > Users > Users.
 """
 }

From c693bace737f53a10cf7c685bbbcee9c77b75c3f Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Mon, 18 Mar 2013 14:53:58 +0530
Subject: [PATCH 17/61] [IMP]Changing the typos and adding space after
 punctuation marks in Models Configuration

bzr revid: dhr@tinyerp.com-20130318092358-z5r8dib33mwddcv8
---
 addons/google_docs/res_config_user_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 2b1f1c1730a..9434fdfe3ab 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -28,8 +28,8 @@
                         <field name='filter_id'/>
                         <p class="oe_grey">
 					To Create a new filter, go to the list of documents you want to attach a google document to and 
-					save the filter.Then come back ti this view.The saved filter will be available in the filed above.
-					For instance,to attach a document to the sales orders of Agrolait,you go to sales orders list view,
+					save the filter. Then come back to this view. The saved filter will be available in the field above.
+					For instance, to attach a document to the sales orders of Agrolait, go to sale orders list view,
 					filter on Agrolait and save the filter.
                         </p>
                     </div>
@@ -40,8 +40,8 @@
                     	<field name='name_template'/>
                     	<p class="oe_grey">
                     		The name of the attached document can use fixed or variable data. To distinguish between documents in
-					Google Drive,use fixed words and fields.For instance,in the example above,if you wrote Agrolait_%%(name)s_Sales
-					in the Google Drive name field,the document in your Google Drive and in OpenERP attachment will be named
+					Google Drive, use fixed words and fields. For instance, in the example above, if you wrote Agrolait_%%(name)s_Sales
+					in the Google Drive name field, the document in your Google Drive and in OpenERP attachment will be named
 					'Agrolait_SO0001_Sales'.
                     	</p>
                     </div>

From aa1e8af0e2a9a0151d9f951fc7fcefe7bc248626 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Mon, 18 Mar 2013 14:58:40 +0530
Subject: [PATCH 18/61] [IMP]Renaming the tab Google Drive Account to Google
 Account

bzr revid: dhr@tinyerp.com-20130318092840-18bg4c81utmo437y
---
 addons/google_base_account/google_base_account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/google_base_account/google_base_account_view.xml b/addons/google_base_account/google_base_account_view.xml
index 11920768b34..9558e2c53f6 100644
--- a/addons/google_base_account/google_base_account_view.xml
+++ b/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="Google Drive Account">
+                    <page string="Google Account">
                         <group string="Google Account" colspan="4">
                             <field name="gmail_user"/>
                             <field name="gmail_password" password="True"/>

From ea53f4fbf6b705d0662749cdf1261269ddbecc09 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Mon, 18 Mar 2013 15:13:05 +0530
Subject: [PATCH 19/61] [IMP]Changing the tooltip for install the google_docs
 module from general settings

bzr revid: dhr@tinyerp.com-20130318094305-3hm52ix3jwuo7tix
---
 addons/base_setup/res_config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index b2e8115c1f9..9d105f94e92 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -36,8 +36,8 @@ class base_config_settings(osv.osv_memory):
             help="""Enable the public part of openerp, openerp becomes a public website."""),
         'module_auth_oauth': fields.boolean('Use external authentication providers, sign in with google, facebook, ...'),
         'module_base_import': fields.boolean("Allow users to import data from CSV files"),
-        'module_google_docs': fields.boolean('Attach a google document to any record',
-            help="""Install the google docs module."""),
+        'module_google_docs': fields.boolean('Attach a google drive to any record',
+            help="""This installs the module google docs."""),
     }
 
     def open_company(self, cr, uid, ids, context=None):

From 7ba1c001491333c0ee5c6cc36728cb2ec95d9c63 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Mon, 18 Mar 2013 17:14:03 +0530
Subject: [PATCH 20/61] [IMP]Changed the demo data for filter and changed the
 name of the newly created attachment

bzr revid: dhr@tinyerp.com-20130318114403-uifxi4p9nlkbac9r
---
 addons/google_docs/__openerp__.py       |  2 +-
 addons/google_docs/google_docs.py       | 18 ++++++++++--------
 addons/google_docs/google_docs_demo.xml |  5 ++---
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 8d16a78a371..8f304e071a6 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -36,7 +36,7 @@
     'demo': [
         'google_docs_demo.xml'
     ],
-    'depends': ['google_base_account','crm','document'],
+    'depends': ['google_base_account','crm'],
     'description': """
 Integrate Google document with OpenERP.
 =======================================
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index b72943c750d..945daa6c119 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -111,7 +111,7 @@ class google_docs_ir_attachment(osv.osv):
 #                'title': title,
 #                'url': gdocs_resource.get_alternate_link().href}
 
-    def copy_gdoc(self, cr, uid, res_model, res_id, name_gdocs,name, gdoc_template_id, context=None):
+    def copy_gdoc(self, cr, uid, res_model, res_id, name_gdocs, gdoc_template_id, context=None):
         '''
         copy an existing document in google docs
            :param res_model: the object for which the google doc is created
@@ -134,7 +134,7 @@ class google_docs_ir_attachment(osv.osv):
             'res_model': res_model,
             'res_id': res_id,
             'type': 'url',
-            'name': name,
+            'name': name_gdocs,
             'url': copy_resource.get_alternate_link().href
         }, context=context)
         return copy_resource.resource_id.text
@@ -190,21 +190,23 @@ class google_docs_ir_attachment(osv.osv):
         # check if a model is configured with a template
         if config_ids:
             name_gdocs = action.name_template
-            print 'name_gdocss',name_gdocs
             try:
+                name_gdocs = name_gdocs % model_fields_dic
                 if name_gdocs.find('model')!=-1:
                     name_gdocs = name_gdocs.replace('model',action.model_id.name)
                 if name_gdocs.find('filter')!=-1:
-                    name_gdocs = name_gdocs.replace('filter',action.filter_id.name)
-                name_gdocs = name_gdocs % model_fields_dic
+                    if action.filter_id:
+                        name_gdocs = name_gdocs.replace('filter',action.filter_id.name)
+                    else:
+                        name_gdocs = name_gdocs.replace('_filter',"")
             except:
                 raise osv.except_osv(_('Key Error!'), _("Your Google Doc Name Pattern's key does not found in object."))
         
-        attach_ids = self.search(cr, uid, [('res_model','=',res_model),('name','=',action.name),('res_id','=',res_id)])
+        attach_ids = self.search(cr, uid, [('res_model','=',res_model),('name','=',name_gdocs),('res_id','=',res_id)])
         if not attach_ids: 
             google_template_id = action.gdocs_resource_id
-            self.copy_gdoc(cr, uid, action.model_id.model, res_id, name_gdocs, action.name, google_template_id, context=context)
-            attach_ids = self.search(cr, uid, [('res_model','=',res_model),('name','=',action.name),('res_id','=',res_id)])
+            self.copy_gdoc(cr, uid, action.model_id.model, res_id, name_gdocs, google_template_id, context=context)
+            attach_ids = self.search(cr, uid, [('res_model','=',res_model),('name','=',name_gdocs),('res_id','=',res_id)])
         attachments =  self.browse(cr, uid, attach_ids, context)[0]
         attachment['url'] = attachments.url
         return attachment
diff --git a/addons/google_docs/google_docs_demo.xml b/addons/google_docs/google_docs_demo.xml
index b679b749c9b..a5288dcf606 100644
--- a/addons/google_docs/google_docs_demo.xml
+++ b/addons/google_docs/google_docs_demo.xml
@@ -4,10 +4,9 @@
 
 <!-- filter demo  -->    
       <record id="filter_crm" model="ir.filters">
-          <field name="name">Sales Team</field>
+          <field name="name">Sales Department</field>
           <field name="model_id">crm.lead</field>
-          <field name="is_default">False</field>
-          <field name="domain">[['section_id', 'ilike', 'sales department']]</field>
+          <field name="domain">[['section_id', '=', 1]]</field>
           <field name="context">{'lang': 'en_US', 'tz': 'Europe/Brussels', 'uid': 1}</field>
       </record>    
 

From 0bc08f0e361566656319347e352f3f99f8b5002a Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Tue, 19 Mar 2013 18:58:27 +0530
Subject: [PATCH 21/61] [IMP]Improved model configuration menu name,template
 field name,tooltip of module, and added field in name list view

bzr revid: dhr@tinyerp.com-20130319132827-boj6dlv2oxkrut2n
---
 addons/base_setup/res_config.py             | 4 ++--
 addons/google_docs/google_docs.py           | 2 +-
 addons/google_docs/res_config_user_view.xml | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 9d105f94e92..dd815f09426 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -36,8 +36,8 @@ class base_config_settings(osv.osv_memory):
             help="""Enable the public part of openerp, openerp becomes a public website."""),
         'module_auth_oauth': fields.boolean('Use external authentication providers, sign in with google, facebook, ...'),
         'module_base_import': fields.boolean("Allow users to import data from CSV files"),
-        'module_google_docs': fields.boolean('Attach a google drive to any record',
-            help="""This installs the module google docs."""),
+        'module_google_docs': fields.boolean('Attach a google document to any record',
+            help="""This installs the module google_docs."""),
     }
 
     def open_company(self, cr, uid, ids, context=None):
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 945daa6c119..020e78a90ae 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -234,7 +234,7 @@ class config(osv.osv):
         'name' : fields.char('Name', required=True, size=1024),
         'model_id': fields.many2one('ir.model', 'Model', required=True),
         'filter_id' : fields.many2one('ir.filters', 'Filter'),
-        'gdocs_template_url': fields.char('Template Url', required=True, size=1024),
+        'gdocs_template_url': fields.char('Template URL', required=True, size=1024),
         'gdocs_resource_id' : fields.function(_resource_get,type="char" ,string='Resource Id',store=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 9434fdfe3ab..0350e6bb238 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -9,6 +9,7 @@
             <field name="model">google.docs.config</field>
             <field name="arch" type="xml">
                 <tree string="Google Drive Configuration">
+                	<field name="name"/>
                     <field name="model_id"/>
                     <field name="name_template"/>
                 </tree>
@@ -82,6 +83,6 @@
     </record>
 
         <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'/>
+        <menuitem name='Template Configuration' id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config'/>
     </data>
 </openerp>

From 1c251ffcf12007434f7c378916654ea14a04723e Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Wed, 20 Mar 2013 11:09:10 +0530
Subject: [PATCH 22/61] [IMP]Made changes as per the review of RPA on 19th
 march

bzr revid: dhr@tinyerp.com-20130320053910-ywjxwwqvxjgrygia
---
 addons/google_docs/google_docs.py           | 30 ++++++++++++---------
 addons/google_docs/google_docs_demo.xml     |  2 +-
 addons/google_docs/res_config_user_view.xml |  8 +++---
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 020e78a90ae..2eabcb1f693 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -172,7 +172,8 @@ class google_docs_ir_attachment(osv.osv):
         """ filter the list record_ids that satisfy the action filter """
         records = {}
         if record_ids and action_filter:
-            assert action.model_id.model == action_filter.model_id, "Filter model different from action rule model"
+            if not action.model_id.model == action_filter.model_id:
+                raise osv.except_osv(_('Warning!'), _("Something went wrong with the configuration of attachments with google drive.Please contact your Administrator to fix the problem."))
             model = self.pool.get(action_filter.model_id)
             domain = [('id', 'in', [record_ids])] + eval(action_filter.domain)
             ctx = dict(context or {})
@@ -183,7 +184,7 @@ class google_docs_ir_attachment(osv.osv):
     def get_attachment(self, cr, uid, res_model, rec_name, ids, context=None):
         res_id = ids[0]
         pool_gdoc_config = self.pool.get('google.docs.config')
-        config_ids = pool_gdoc_config.search(cr, uid, [('model_id', '=', res_model)], context=context)[0]
+        config_ids = pool_gdoc_config.search(cr, uid, [('model_id', '=', res_model),('name','=',rec_name['label'])], context=context)[0]
         action = pool_gdoc_config.browse(cr, uid, config_ids, context=context)
         attachment = {}
         model_fields_dic = self.pool.get(res_model).read(cr, uid, res_id, [], context=context)
@@ -219,15 +220,18 @@ class config(osv.osv):
         result = {}
         for data in self.browse(cr, uid, ids, context):
             template_url = data.gdocs_template_url
-            url = urlparse(template_url)
-            res = url.path.split('/')
-            resource = res[1]
-            if res[1]== "spreadsheet":
-                key = url.query.split('=')[1]
-            else:
-                key = res[3]
-            res_id = resource + ":" + key
-            result[data.id] = str(res_id)
+            try:
+                url = urlparse(template_url)
+                res = url.path.split('/')
+                resource = res[1]
+                if res[1]== "spreadsheet":
+                    key = url.query.split('=')[1]
+                else:
+                    key = res[3]
+                res_id = resource + ":" + key
+                result[data.id] = str(res_id)
+            except:
+                raise osv.except_osv(_('Incorrect URL!'), _("Please enter a valid URL."))
         return result
 
     _columns = {
@@ -239,7 +243,8 @@ class config(osv.osv):
         '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),
     }
 
-    def onchange_model_id(self, cr, uid, ids, model_id):
+    def onchange_model_id(self, cr, uid, ids, model_id,filter_id):
+         print 'fffffffff',filter_id
          res = {'domain':{'filter_id':[]}}
          if model_id:
              model_name = self.pool.get('ir.model').read(cr, uid, model_id, ['model'])
@@ -248,6 +253,7 @@ class config(osv.osv):
                  res['domain'] = {'filter_id': [('model_id', '=', mod_name)]}
          else:
              res['value'] = {'filter_id': False}
+         print 'rrrrrrr',res
          return res
 
     _defaults = {
diff --git a/addons/google_docs/google_docs_demo.xml b/addons/google_docs/google_docs_demo.xml
index a5288dcf606..4f63aa0955c 100644
--- a/addons/google_docs/google_docs_demo.xml
+++ b/addons/google_docs/google_docs_demo.xml
@@ -16,7 +16,7 @@
           <field name="model_id" ref="crm.model_crm_lead"/>
           <field name="filter_id" ref="filter_crm"/>
           <field name="gdocs_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
-          <field name="name_template">lead_sales-department_%%(name)s_review</field>
+          <field name="name_template">lead_sales-department_%(name)s_review</field>
       </record>
       
     </data>
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 0350e6bb238..c801f838202 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -59,10 +59,10 @@
             <field name='view_id' ref='view_google_docs_config_tree'/>
             <field name="help" type="html">
               <p>
-               "Link your first Google document to openERP documents
-                You use to control the quality of your product in a spreadheet ?
-                You review the delivery checklist for each delivery order in a  foreign country ? ...
-                Link your own templates on any documents of OpenERP
+                Link your first Google document to OpenERP documents.
+                You can use it to control the quality of your product in a spreadsheet or
+                review the delivery checklist for each delivery order in a foreign country
+                and in many more ways. Link your own templates on any documents of OpenERP.
               </p>
             </field>
         </record>

From c575ebfc4d181bbc9c2bc0cfa87f5fc6b36bd8ab Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Wed, 20 Mar 2013 13:59:56 +0530
Subject: [PATCH 23/61] [IMP] google_docs : constraint added

bzr revid: rpr@tinyerp.com-20130320082956-yuwftz4vp6xq11au
---
 addons/google_docs/google_docs.py           | 8 +++++---
 addons/google_docs/res_config_user_view.xml | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 2eabcb1f693..d487d31c0d6 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -243,17 +243,19 @@ class config(osv.osv):
         '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),
     }
 
-    def onchange_model_id(self, cr, uid, ids, model_id,filter_id):
-         print 'fffffffff',filter_id
+    def onchange_model_id(self, cr, uid, ids, model_id, filter_id, context=None):
          res = {'domain':{'filter_id':[]}}
          if model_id:
              model_name = self.pool.get('ir.model').read(cr, uid, model_id, ['model'])
+             if filter_id:
+                 filter = self.pool.get('ir.filters').read(cr, uid, filter_id, ['model_id'])
+                 if not model_name['model'] == filter['model_id']:
+                     raise osv.except_osv(_('Warning!'), _('Filter does not match with selected Model!'))
              if model_name:
                  mod_name = model_name['model']
                  res['domain'] = {'filter_id': [('model_id', '=', mod_name)]}
          else:
              res['value'] = {'filter_id': False}
-         print 'rrrrrrr',res
          return res
 
     _defaults = {
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index c801f838202..d314052d29a 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -23,7 +23,7 @@
                 <form string="Google Drive Configuration" version="7.0">
                 <group>
                 	<field name="name"/>
-                    <field name="model_id" on_change="onchange_model_id(model_id)"/>
+                    <field name="model_id" on_change="onchange_model_id(model_id,filter_id)"/>
                     <label for='filter_id'/>
                     <div>
                         <field name='filter_id'/>

From f449ab66d9224a7f6aa9e11ded9959191e0bd218 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 22 Mar 2013 17:58:59 +0530
Subject: [PATCH 24/61] [IMP] google_docs : Made changes as per the review of
 RPA on 21th march

bzr revid: rpr@tinyerp.com-20130322122859-2s1wd5tba9u58g5f
---
 addons/google_docs/google_docs.py           | 24 +++++++++++++++------
 addons/google_docs/google_docs_demo.xml     |  3 ++-
 addons/google_docs/res_config_user_view.xml | 11 +++++-----
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index d487d31c0d6..f88d408b253 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -235,7 +235,7 @@ class config(osv.osv):
         return result
 
     _columns = {
-        'name' : fields.char('Name', required=True, size=1024),
+        'name' : fields.char('Template Name', required=True, size=1024),
         'model_id': fields.many2one('ir.model', 'Model', required=True),
         'filter_id' : fields.many2one('ir.filters', 'Filter'),
         'gdocs_template_url': fields.char('Template URL', required=True, size=1024),
@@ -243,14 +243,10 @@ class config(osv.osv):
         '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),
     }
 
-    def onchange_model_id(self, cr, uid, ids, model_id, filter_id, context=None):
+    def onchange_model_id(self, cr, uid, ids, model_id, context=None):
          res = {'domain':{'filter_id':[]}}
          if model_id:
              model_name = self.pool.get('ir.model').read(cr, uid, model_id, ['model'])
-             if filter_id:
-                 filter = self.pool.get('ir.filters').read(cr, uid, filter_id, ['model_id'])
-                 if not model_name['model'] == filter['model_id']:
-                     raise osv.except_osv(_('Warning!'), _('Filter does not match with selected Model!'))
              if model_name:
                  mod_name = model_name['model']
                  res['domain'] = {'filter_id': [('model_id', '=', mod_name)]}
@@ -262,4 +258,20 @@ class config(osv.osv):
         'name_template': '%(name)s_model_filter_gdoc',
     }
 
+    def _check_model_id(self, cr, uid, ids, context=None):
+        pool_id = self.browse(cr, uid, ids[0], context=context)
+        model_id = pool_id.model_id.id
+        filter_id = pool_id.filter_id.id
+        if model_id:
+             model_name = self.pool.get('ir.model').read(cr, uid, model_id, ['model'])
+             if filter_id:
+                 filter = self.pool.get('ir.filters').read(cr, uid, filter_id, ['model_id'])
+                 if model_name['model'] != filter['model_id']:
+                    return False
+        return True
+
+    _constraints = [
+        (_check_model_id, 'The model or filter chosen have not matched.', ['model_id','filter_id']),
+    ]
+
 config()
diff --git a/addons/google_docs/google_docs_demo.xml b/addons/google_docs/google_docs_demo.xml
index 4f63aa0955c..36e5f4fb227 100644
--- a/addons/google_docs/google_docs_demo.xml
+++ b/addons/google_docs/google_docs_demo.xml
@@ -7,7 +7,8 @@
           <field name="name">Sales Department</field>
           <field name="model_id">crm.lead</field>
           <field name="domain">[['section_id', '=', 1]]</field>
-          <field name="context">{'lang': 'en_US', 'tz': 'Europe/Brussels', 'uid': 1}</field>
+          <field name="context">{'lang': 'en_US', 'tz': 'Europe/Brussels'}</field> 
+          <field name="user_id" eval="False"/>
       </record>    
 
 <!-- template demo -->
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index d314052d29a..8b801767d52 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -11,7 +11,6 @@
                 <tree string="Google Drive Configuration">
                 	<field name="name"/>
                     <field name="model_id"/>
-                    <field name="name_template"/>
                 </tree>
             </field>
         </record>
@@ -23,7 +22,7 @@
                 <form string="Google Drive Configuration" version="7.0">
                 <group>
                 	<field name="name"/>
-                    <field name="model_id" on_change="onchange_model_id(model_id,filter_id)"/>
+                    <field name="model_id" on_change="onchange_model_id(model_id)"/>
                     <label for='filter_id'/>
                     <div>
                         <field name='filter_id'/>
@@ -52,13 +51,15 @@
         </record>
 
         <record model='ir.actions.act_window' id='action_google_docs_users_config'>
-            <field name='name'>Models configuration</field>
+            <field name='name'>Google Drive Templates</field>
             <field name='res_model'>google.docs.config</field>
             <field name='type'>ir.actions.act_window</field>
             <field name='view_type'>form</field>
             <field name='view_id' ref='view_google_docs_config_tree'/>
             <field name="help" type="html">
-              <p>
+              <p class="oe_view_nocontent_create">
+               Click to add a new template.
+              </p><p>
                 Link your first Google document to OpenERP documents.
                 You can use it to control the quality of your product in a spreadsheet or
                 review the delivery checklist for each delivery order in a foreign country
@@ -83,6 +84,6 @@
     </record>
 
         <menuitem name='Google Drive configuration' id='menu_gdocs_config' parent='base.menu_administration'/>
-        <menuitem name='Template Configuration' id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config'/>
+        <menuitem id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config'/>
     </data>
 </openerp>

From 9e4ab411bc8d9b734e05bc407a9d9a7fcfc453ad Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Tue, 26 Mar 2013 13:11:22 +0530
Subject: [PATCH 25/61] [IMP] google_docs : changes for empty list and user
 preference google account

bzr revid: rpr@tinyerp.com-20130326074122-5h8b40ubel4ssgrp
---
 .../google_base_account_view.xml                  | 15 +++++++++++++++
 addons/google_docs/res_config_user_view.xml       |  9 +++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/addons/google_base_account/google_base_account_view.xml b/addons/google_base_account/google_base_account_view.xml
index 9558e2c53f6..999a299fd92 100644
--- a/addons/google_base_account/google_base_account_view.xml
+++ b/addons/google_base_account/google_base_account_view.xml
@@ -16,5 +16,20 @@
                 </xpath>
             </field>
         </record>
+        <record id="view_users_gogole_preference" model="ir.ui.view">
+            <field name="name">res.users.google.form2</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='preferences']" position="after">
+                    <page string="Google Account">
+                        <group string="Google Account" colspan="4">
+                            <field name="gmail_user"/>
+                            <field name="gmail_password" password="True"/>
+                        </group>
+                    </page>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 8b801767d52..860730cefee 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -60,10 +60,11 @@
               <p class="oe_view_nocontent_create">
                Click to add a new template.
               </p><p>
-                Link your first Google document to OpenERP documents.
-                You can use it to control the quality of your product in a spreadsheet or
-                review the delivery checklist for each delivery order in a foreign country
-                and in many more ways. Link your own templates on any documents of OpenERP.
+                Link your google drive template to any record of OpenERP 
+                You use to control the quality of your product in a spreadheet 
+                and you review the delivery checklist for each delivery order in a  foreign country.
+                To do  it, you have really specific documents you want your collaborator fill in.
+                It is not an issue, here, feel free to add any template in OpenERP to link your specific documents to any records. 
               </p>
             </field>
         </record>

From a6fb77926c6eb971176e8789a47eba63f80d1d5d Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Tue, 26 Mar 2013 14:56:30 +0530
Subject: [PATCH 26/61] [IMP] google_docs : changes for name_remplate in google
 template

bzr revid: rpr@tinyerp.com-20130326092630-36b35ywehzttp697
---
 addons/google_docs/google_docs.py | 36 +++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index f88d408b253..dd2d9062080 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -188,18 +188,13 @@ class google_docs_ir_attachment(osv.osv):
         action = pool_gdoc_config.browse(cr, uid, config_ids, context=context)
         attachment = {}
         model_fields_dic = self.pool.get(res_model).read(cr, uid, res_id, [], context=context)
+        if model_fields_dic['name']:
+            model_fields_dic['name'] = model_fields_dic['name'].replace(' ','-')
         # check if a model is configured with a template
         if config_ids:
             name_gdocs = action.name_template
             try:
                 name_gdocs = name_gdocs % model_fields_dic
-                if name_gdocs.find('model')!=-1:
-                    name_gdocs = name_gdocs.replace('model',action.model_id.name)
-                if name_gdocs.find('filter')!=-1:
-                    if action.filter_id:
-                        name_gdocs = name_gdocs.replace('filter',action.filter_id.name)
-                    else:
-                        name_gdocs = name_gdocs.replace('_filter',"")
             except:
                 raise osv.except_osv(_('Key Error!'), _("Your Google Doc Name Pattern's key does not found in object."))
         
@@ -234,14 +229,37 @@ class config(osv.osv):
                 raise osv.except_osv(_('Incorrect URL!'), _("Please enter a valid URL."))
         return result
 
+    def _name_google_template_get(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        res_id = ids[0]
+        doc_pool = self.browse(cr, uid, ids[0], context)
+        label = doc_pool.name
+        res_model = doc_pool.model_id
+        res_fields_dic = self.pool.get(res_model.model).read(cr, uid, res_id, [], context=context)
+        doc_ids = self.search(cr, uid, [('model_id', '=', res_model.model),('name','=',label)], context=context)[0]
+        act = self.browse(cr, uid, doc_ids, context=context)
+        if doc_ids:
+            name_temp = act.name_template
+            if name_temp.find('model')!=-1:
+                name_temp = name_temp.replace('model',act.model_id.name)
+                res[doc_pool.id] = name_temp
+            if name_temp.find('filter')!=-1:
+                if act.filter_id:
+                    name_temp = name_temp.replace('filter',act.filter_id.name)
+                    res[doc_pool.id] = name_temp
+                else:
+                    name_temp = name_temp.replace('_filter',"")
+                    res[doc_pool.id] = name_temp
+        return res
+
     _columns = {
         'name' : fields.char('Template Name', required=True, size=1024),
         'model_id': fields.many2one('ir.model', 'Model', required=True),
         'filter_id' : fields.many2one('ir.filters', 'Filter'),
         'gdocs_template_url': fields.char('Template URL', required=True, size=1024),
         'gdocs_resource_id' : fields.function(_resource_get,type="char" ,string='Resource Id',store=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),
-    }
+        'name_template': fields.function(_name_google_template_get,type="char", string='Google Drive Name Pattern', help='Choose how the new google drive will be named, on google side. Eg. gdoc_%(field_name)s',store=True),
+            }
 
     def onchange_model_id(self, cr, uid, ids, model_id, context=None):
          res = {'domain':{'filter_id':[]}}

From 0bdf0ebaf57fd7a4d52132f800366b251d2eab82 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Thu, 28 Mar 2013 10:57:01 +0530
Subject: [PATCH 27/61] [IMP] google_docs : changes for view

bzr revid: rpr@tinyerp.com-20130328052701-mmcmth3ie6c1kwgc
---
 addons/google_base_account/google_base_account_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/google_base_account/google_base_account_view.xml b/addons/google_base_account/google_base_account_view.xml
index 999a299fd92..366c39f6414 100644
--- a/addons/google_base_account/google_base_account_view.xml
+++ b/addons/google_base_account/google_base_account_view.xml
@@ -22,12 +22,10 @@
             <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='preferences']" position="after">
-                    <page string="Google Account">
                         <group string="Google Account" colspan="4">
                             <field name="gmail_user"/>
                             <field name="gmail_password" password="True"/>
                         </group>
-                    </page>
                 </xpath>
             </field>
         </record>

From 074661f4c7162193701cf0321d0532d880b6db9e Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 28 Mar 2013 11:55:10 +0530
Subject: [PATCH 28/61] [IMP]: google_docs: Improved empty list message of
 google drive config.

bzr revid: rpa@tinyerp.com-20130328062510-9239e59m6vpaef5f
---
 addons/google_docs/res_config_user_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 860730cefee..1f19aafaca6 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -60,11 +60,11 @@
               <p class="oe_view_nocontent_create">
                Click to add a new template.
               </p><p>
-                Link your google drive template to any record of OpenERP 
-                You use to control the quality of your product in a spreadheet 
-                and you review the delivery checklist for each delivery order in a  foreign country.
-                To do  it, you have really specific documents you want your collaborator fill in.
-                It is not an issue, here, feel free to add any template in OpenERP to link your specific documents to any records. 
+                Link your google drive template to any record of OpenERP.
+                If you have really specific documents you want your collaborator fill in,
+                e.g. 
+                Using a spreadsheet to control the quality of your product, reviewing the delivery checklist for each delivery order in a foreign country in a document...
+                Its very easy to manage them by adding a Google Drive template in OpenERP to link your specific document to any records.
               </p>
             </field>
         </record>

From f3d3de20de66a798d928ee31afd462266a79ef46 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 28 Mar 2013 12:42:12 +0530
Subject: [PATCH 29/61] [REF]: google_docs: Improved code for constraint

bzr revid: rpa@tinyerp.com-20130328071212-kaim6d0oblhhq1a5
---
 addons/google_docs/google_docs.py | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index dd2d9062080..c33fbbde616 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -277,19 +277,13 @@ class config(osv.osv):
     }
 
     def _check_model_id(self, cr, uid, ids, context=None):
-        pool_id = self.browse(cr, uid, ids[0], context=context)
-        model_id = pool_id.model_id.id
-        filter_id = pool_id.filter_id.id
-        if model_id:
-             model_name = self.pool.get('ir.model').read(cr, uid, model_id, ['model'])
-             if filter_id:
-                 filter = self.pool.get('ir.filters').read(cr, uid, filter_id, ['model_id'])
-                 if model_name['model'] != filter['model_id']:
-                    return False
+        config_id = self.browse(cr, uid, ids[0], context=context)
+        if config_id.filter_id.id and config_id.model_id.model != config_id.filter_id.model_id:
+            return False
         return True
 
     _constraints = [
-        (_check_model_id, 'The model or filter chosen have not matched.', ['model_id','filter_id']),
+        (_check_model_id, 'Model of selected filter is not matching with model of current template.', ['model_id','filter_id']),
     ]
 
 config()

From deb23a62b75e332e0b6a6f24df8b8c5d704ffc98 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Mon, 1 Apr 2013 13:33:23 +0530
Subject: [PATCH 30/61] [IMP] google_docs : changes for code and rpa review 28
 march

bzr revid: rpr@tinyerp.com-20130401080323-vdw9rgdvzi0qyqrf
---
 addons/google_docs/google_docs.py           | 138 +++++++-------------
 addons/google_docs/google_docs_demo.xml     |   4 +-
 addons/google_docs/res_config_user_view.xml |   2 +-
 addons/google_docs/static/src/js/gdocs.js   |  17 +--
 4 files changed, 58 insertions(+), 103 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index c33fbbde616..3894eb7f318 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -86,31 +86,6 @@ class google_docs_ir_attachment(osv.osv):
         _logger.info('Logged into google docs as %s', user_config['user'])
         return client
 
-#    def create_empty_google_doc(self, cr, uid, res_model, res_id, context=None):
-#        '''Create a new google document, empty and with a default type (txt)
-#           :param res_model: the object for which the google doc is created
-#           :param res_id: the Id of the object for which the google doc is created
-#           :return: the ID of the google document object created
-#        '''
-#        #login with the base account google module
-#        client = self._auth(cr, uid, context=context)
-#        # create the document in google docs
-#        title = "%s %s" % (context.get("name","Untitled Document."), datetime.today().strftime(DEFAULT_SERVER_DATETIME_FORMAT))
-#        local_resource = gdata.docs.data.Resource(gdata.docs.data.SPREADSHEET_LABEL,title=title)
-#        #create a new doc in Google Docs 
-#        gdocs_resource = client.post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
-#        # create an ir.attachment into the db
-#        self.create(cr, uid, {
-#            'res_model': res_model,
-#            'res_id': res_id,
-#            'type': 'url',
-#            'name': title,
-#            'url': gdocs_resource.get_alternate_link().href,
-#        }, context=context)
-#        return {'resource_id': gdocs_resource.resource_id.text,
-#                'title': title,
-#                'url': gdocs_resource.get_alternate_link().href}
-
     def copy_gdoc(self, cr, uid, res_model, res_id, name_gdocs, gdoc_template_id, context=None):
         '''
         copy an existing document in google docs
@@ -139,7 +114,7 @@ class google_docs_ir_attachment(osv.osv):
         }, context=context)
         return copy_resource.resource_id.text
 
-    def google_doc_get(self, cr, uid, res_model, ids, context=None):
+    def get_google_docs_config(self, cr, uid, res_model, res_id, context=None):
         '''
         Function called by the js, when no google doc are yet associated with a record, with the aim to create one. It
         will first seek for a google.docs.config associated with the model `res_model` to find out what's the template
@@ -149,30 +124,28 @@ class google_docs_ir_attachment(osv.osv):
           :param res_model: the object for which the google doc is created
           :param ids: the list of ids of the objects for which the google doc is created. This list is supposed to have
             a length of 1 element only (batch processing is not supported in the code, though nothing really prevent it)
-          :return: the google document object created
+          :return: the config id and config name
         '''
-        if len(ids) != 1:
+        if not res_id:
             raise osv.except_osv(_('Google Drive Error!'), _("Creating google drive may only be done by one at a time."))
-        res_id = ids[0]
         pool_gdoc_config = self.pool.get('google.docs.config')
-
+        # check if a model is configured with a template
         config_ids = pool_gdoc_config.search(cr, uid, [('model_id', '=', res_model)], context=context)
-        config = []
-        for config_id in config_ids:
-            action = pool_gdoc_config.browse(cr, uid, config_id, context=context)
-            if action.filter_id:
-                google_doc_configs = self._filt(cr, uid, action, action.filter_id, res_id, context=context)
+        configs = []
+        for config  in pool_gdoc_config.browse(cr, uid, config_ids, context=context):
+            if config.filter_id:
+                google_doc_configs = self._filter(cr, uid, config, config.filter_id, res_id, context=context)
                 if google_doc_configs: 
-                    config.append(action.name)
+                    configs.append({'id': config.id, 'name': config.name})
             else:
-                config.append(action.name)
-        return config
+                configs.append({'id': config.id, 'name': config.name})
+        return configs
     
-    def _filt(self, cr, uid, action, action_filter, record_ids, context=None):
+    def _filter(self, cr, uid, action, action_filter, record_ids, context=None):
         """ filter the list record_ids that satisfy the action filter """
         records = {}
         if record_ids and action_filter:
-            if not action.model_id.model == action_filter.model_id:
+            if not action.model_id == action_filter.model_id:
                 raise osv.except_osv(_('Warning!'), _("Something went wrong with the configuration of attachments with google drive.Please contact your Administrator to fix the problem."))
             model = self.pool.get(action_filter.model_id)
             domain = [('id', 'in', [record_ids])] + eval(action_filter.domain)
@@ -181,36 +154,43 @@ class google_docs_ir_attachment(osv.osv):
             record_ids = model.search(cr, uid, domain, context=ctx)
         return record_ids
     
-    def get_attachment(self, cr, uid, res_model, rec_name, ids, context=None):
-        res_id = ids[0]
+    def get_google_attachment(self, cr, uid, config_id, res_id, context=None):
         pool_gdoc_config = self.pool.get('google.docs.config')
-        config_ids = pool_gdoc_config.search(cr, uid, [('model_id', '=', res_model),('name','=',rec_name['label'])], context=context)[0]
-        action = pool_gdoc_config.browse(cr, uid, config_ids, context=context)
-        attachment = {}
-        model_fields_dic = self.pool.get(res_model).read(cr, uid, res_id, [], context=context)
-        if model_fields_dic['name']:
-            model_fields_dic['name'] = model_fields_dic['name'].replace(' ','-')
-        # check if a model is configured with a template
-        if config_ids:
-            name_gdocs = action.name_template
+        pool_model = self.pool.get("ir.model")
+        attachment = {'url': False}
+        config = pool_gdoc_config.browse(cr, uid, config_id, context=context)
+        if config:
+            res_model = config.model_id
+            model_ids = pool_model.search(cr, uid, [('model','=',res_model)])
+            if not model_ids:
+                return attachment
+            model = pool_model.browse(cr, uid, model_ids[0], context=context)
+            record = self.pool.get(res_model).browse(cr, uid, res_id, context=context)
+            filter_name = config.filter_id and config.filter_id.name or False
+            name_gdocs = config.name_template or "%(name)s_%(model)s_%(filter)s_gdrive"
             try:
-                name_gdocs = name_gdocs % model_fields_dic
+                name_gdocs = name_gdocs % {'name': record.name, 'model': model.name, 'filter': filter_name}
             except:
                 raise osv.except_osv(_('Key Error!'), _("Your Google Doc Name Pattern's key does not found in object."))
-        
-        attach_ids = self.search(cr, uid, [('res_model','=',res_model),('name','=',name_gdocs),('res_id','=',res_id)])
-        if not attach_ids: 
-            google_template_id = action.gdocs_resource_id
-            self.copy_gdoc(cr, uid, action.model_id.model, res_id, name_gdocs, google_template_id, context=context)
+    
             attach_ids = self.search(cr, uid, [('res_model','=',res_model),('name','=',name_gdocs),('res_id','=',res_id)])
-        attachments =  self.browse(cr, uid, attach_ids, context)[0]
-        attachment['url'] = attachments.url
+            if not attach_ids: 
+                google_template_id = config.gdocs_resource_id
+                attach_id = self.copy_gdoc(cr, uid, config.model_id, res_id, name_gdocs, google_template_id, context=context)
+            else:
+                attach_id = attach_ids[0] 
+            attachments = self.browse(cr, uid, attach_id, context)
+            attachment['url'] = attachments.url
         return attachment
 
 class config(osv.osv):
     _name = 'google.docs.config'
     _description = "Google Drive templates config"
     
+    def _list_all_models(self, cr, uid, context=None):
+        cr.execute("SELECT model, name from ir_model")
+        return cr.fetchall()
+    
     def _resource_get(self, cr, uid, ids, name, arg, context=None):
         result = {}
         for data in self.browse(cr, uid, ids, context):
@@ -229,56 +209,30 @@ class config(osv.osv):
                 raise osv.except_osv(_('Incorrect URL!'), _("Please enter a valid URL."))
         return result
 
-    def _name_google_template_get(self, cr, uid, ids, name, arg, context=None):
-        res = {}
-        res_id = ids[0]
-        doc_pool = self.browse(cr, uid, ids[0], context)
-        label = doc_pool.name
-        res_model = doc_pool.model_id
-        res_fields_dic = self.pool.get(res_model.model).read(cr, uid, res_id, [], context=context)
-        doc_ids = self.search(cr, uid, [('model_id', '=', res_model.model),('name','=',label)], context=context)[0]
-        act = self.browse(cr, uid, doc_ids, context=context)
-        if doc_ids:
-            name_temp = act.name_template
-            if name_temp.find('model')!=-1:
-                name_temp = name_temp.replace('model',act.model_id.name)
-                res[doc_pool.id] = name_temp
-            if name_temp.find('filter')!=-1:
-                if act.filter_id:
-                    name_temp = name_temp.replace('filter',act.filter_id.name)
-                    res[doc_pool.id] = name_temp
-                else:
-                    name_temp = name_temp.replace('_filter',"")
-                    res[doc_pool.id] = name_temp
-        return res
-
     _columns = {
         'name' : fields.char('Template Name', required=True, size=1024),
-        'model_id': fields.many2one('ir.model', 'Model', required=True),
+        'model_id': fields.selection(_list_all_models, 'Model', required=True),
         'filter_id' : fields.many2one('ir.filters', 'Filter'),
         'gdocs_template_url': fields.char('Template URL', required=True, size=1024),
         'gdocs_resource_id' : fields.function(_resource_get,type="char" ,string='Resource Id',store=True),
-        'name_template': fields.function(_name_google_template_get,type="char", string='Google Drive Name Pattern', help='Choose how the new google drive will be named, on google side. Eg. gdoc_%(field_name)s',store=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),
             }
 
     def onchange_model_id(self, cr, uid, ids, model_id, context=None):
-         res = {'domain':{'filter_id':[]}}
+         res = {}
          if model_id:
-             model_name = self.pool.get('ir.model').read(cr, uid, model_id, ['model'])
-             if model_name:
-                 mod_name = model_name['model']
-                 res['domain'] = {'filter_id': [('model_id', '=', mod_name)]}
+            res['domain'] = {'filter_id': [('model_id', '=', model_id), ('user_id','=',False)]}
          else:
-             res['value'] = {'filter_id': False}
+             res['value'] = {'filter_id': [('user_id','=',False)]}
          return res
 
     _defaults = {
-        'name_template': '%(name)s_model_filter_gdoc',
+        'name_template': '%(name)s_%(model)s_%(filter)s_gdrive',
     }
 
     def _check_model_id(self, cr, uid, ids, context=None):
         config_id = self.browse(cr, uid, ids[0], context=context)
-        if config_id.filter_id.id and config_id.model_id.model != config_id.filter_id.model_id:
+        if config_id.filter_id.id and config_id.model_id != config_id.filter_id.model_id:
             return False
         return True
 
diff --git a/addons/google_docs/google_docs_demo.xml b/addons/google_docs/google_docs_demo.xml
index 36e5f4fb227..b877e45aefa 100644
--- a/addons/google_docs/google_docs_demo.xml
+++ b/addons/google_docs/google_docs_demo.xml
@@ -14,10 +14,10 @@
 <!-- template demo -->
       <record id="template_crm" model="google.docs.config">
       	  <field name="name">Sales Department Opportunities</field>
-          <field name="model_id" ref="crm.model_crm_lead"/>
+          <field name="model_id">crm.lead</field>
           <field name="filter_id" ref="filter_crm"/>
           <field name="gdocs_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
-          <field name="name_template">lead_sales-department_%(name)s_review</field>
+          <field name="name_template">%(name)s_%(model)s_%(filter)s_gdrive</field>
       </record>
       
     </data>
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 1f19aafaca6..a874d802c98 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -25,7 +25,7 @@
                     <field name="model_id" on_change="onchange_model_id(model_id)"/>
                     <label for='filter_id'/>
                     <div>
-                        <field name='filter_id'/>
+                        <field name='filter_id' context="{'default_user_id': False, 'default_model_id': model_id}" domain="[('user_id','=',False)]"/>
                         <p class="oe_grey">
 					To Create a new filter, go to the list of documents you want to attach a google document to and 
 					save the filter. Then come back to this view. The saved filter will be available in the field above.
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index e5461e2c919..5b179f41ee6 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -14,32 +14,33 @@ var _t = instance.web._t,
             	ids = []
             	view.on("load_record", self, function(r){
 		            	ids = [r.id]
-		            	self.add_gdoc_items(view,ids)
+		            	self.add_gdoc_items(view, r.id)
             		});
             	}
         	},
         
-	      add_gdoc_items: function(view,ids){
+	      add_gdoc_items: function(view, res_id){
 	        	var self = this;
 	        	var gdoc_item = _.indexOf(_.pluck(self.items.other,'classname'),'oe_share_gdoc');
 	        	if(gdoc_item !== -1)
 	        	{
 	        		self.items.other.splice(gdoc_item,1);
 	        	}
-	        	if( !_.isEmpty(ids) ){
+	        	if( res_id ){
 	                view.sidebar_eval_context().done(function (context) {
 		            var ds = new instance.web.DataSet(this, 'ir.attachment', context);
-		            ds.call('google_doc_get', [view.dataset.model, ids, context]).done(function(r) {
+		            ds.call('get_google_docs_config', [view.dataset.model, res_id, context]).done(function(r) {
 		            	if(!_.isEmpty(r)){
 		            	_.each(r,function(res){
-		            		var g_item = _.indexOf(_.pluck(self.items.other,'label'),res);
+		            		var g_item = _.indexOf(_.pluck(self.items.other,'label'),res.name);
 				        	if(g_item !== -1)
 				        	{
 				        		self.items.other.splice(g_item,1);
 				        	}
 				   
 		            		self.add_items('other', [
-		                    {   label: res,
+		                    {   label: res.name,
+		                        config_id: res.id,
 		                        callback: self.on_google_doc,
 		                        classname: 'oe_share_gdoc' },
 		                	]);
@@ -51,14 +52,14 @@ var _t = instance.web._t,
 	        },
         
         
-	        on_google_doc: function(r) {
+	        on_google_doc: function(doc_item) {
 	            var self = this;
 	            var view = self.getParent();
 	            var ids = ( view.fields_view.type != "form" )? view.groups.get_selection().ids : [ view.datarecord.id ];
 	            if( !_.isEmpty(ids) ){
 	                view.sidebar_eval_context().done(function (context) {
 	                    var ds = new instance.web.DataSet(this, 'ir.attachment', context);
-	                    ds.call('get_attachment', [view.dataset.model, r, ids, context]).done(function(res) {
+	                    ds.call('get_google_attachment', [doc_item.config_id, view.datarecord.id, context]).done(function(res) {
 	                        window.open(res.url,"_blank");
 	                        view.reload();
 	                    })

From d241e853ca60cdfe3758113cd6019eab541c4955 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Mon, 1 Apr 2013 15:01:52 +0530
Subject: [PATCH 31/61] [IMP] google_docs : changes for user field in filters

bzr revid: rpr@tinyerp.com-20130401093152-02ux70o02dxp5a2a
---
 addons/google_docs/google_docs.py           |  2 +-
 addons/google_docs/res_config_user_view.xml | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 3894eb7f318..999e4b29a29 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -188,7 +188,7 @@ class config(osv.osv):
     _description = "Google Drive templates config"
     
     def _list_all_models(self, cr, uid, context=None):
-        cr.execute("SELECT model, name from ir_model")
+        cr.execute("SELECT model, name from ir_model order by name")
         return cr.fetchall()
     
     def _resource_get(self, cr, uid, ids, name, arg, context=None):
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index a874d802c98..8e75577999d 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -25,7 +25,7 @@
                     <field name="model_id" on_change="onchange_model_id(model_id)"/>
                     <label for='filter_id'/>
                     <div>
-                        <field name='filter_id' context="{'default_user_id': False, 'default_model_id': model_id}" domain="[('user_id','=',False)]"/>
+                        <field name='filter_id' context="{'default_user_id': False, 'default_model_id': model_id, 'hide_user_field': True}" domain="[('user_id','=',False)]"/>
                         <p class="oe_grey">
 					To Create a new filter, go to the list of documents you want to attach a google document to and 
 					save the filter. Then come back to this view. The saved filter will be available in the field above.
@@ -84,6 +84,17 @@
         </field>
     </record>
 
+        <record id="inherited_ir_filters_view" model="ir.ui.view">
+        <field name="name">filters</field>
+        <field name="model">ir.filters</field>
+        <field name="inherit_id" ref="base.ir_filters_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='user_id']" position="replace">
+                <field name="user_id" invisible="context.get('hide_user_field', False)"/>
+            </xpath>
+        </field>
+    </record>
+
         <menuitem name='Google Drive configuration' id='menu_gdocs_config' parent='base.menu_administration'/>
         <menuitem id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config'/>
     </data>

From cc69f7e2e2de7f33a4848a9ef1c3a58dad18437e Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Wed, 3 Apr 2013 14:34:04 +0530
Subject: [PATCH 32/61] [IMP] google_docs : changes for tooltip and
 name_template

bzr revid: rpr@tinyerp.com-20130403090404-skf3m78u0ervtg6y
---
 addons/google_docs/google_docs.py           | 7 ++++---
 addons/google_docs/res_config_user_view.xml | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 999e4b29a29..5a72febee8e 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -164,12 +164,13 @@ class google_docs_ir_attachment(osv.osv):
             model_ids = pool_model.search(cr, uid, [('model','=',res_model)])
             if not model_ids:
                 return attachment
-            model = pool_model.browse(cr, uid, model_ids[0], context=context)
-            record = self.pool.get(res_model).browse(cr, uid, res_id, context=context)
+            model = pool_model.browse(cr, uid, model_ids[0], context=context).name
             filter_name = config.filter_id and config.filter_id.name or False
+            record = self.pool.get(res_model).read(cr, uid, res_id, [], context=context)
+            record.update({'model': model,'filter':filter_name})
             name_gdocs = config.name_template or "%(name)s_%(model)s_%(filter)s_gdrive"
             try:
-                name_gdocs = name_gdocs % {'name': record.name, 'model': model.name, 'filter': filter_name}
+                name_gdocs = name_gdocs % record
             except:
                 raise osv.except_osv(_('Key Error!'), _("Your Google Doc Name Pattern's key does not found in object."))
     
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 8e75577999d..9a0a07dc590 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -27,10 +27,10 @@
                     <div>
                         <field name='filter_id' context="{'default_user_id': False, 'default_model_id': model_id, 'hide_user_field': True}" domain="[('user_id','=',False)]"/>
                         <p class="oe_grey">
-					To Create a new filter, go to the list of documents you want to attach a google document to and 
-					save the filter. Then come back to this view. The saved filter will be available in the field above.
-					For instance, to attach a document to the sales orders of Agrolait, go to sale orders list view,
-					filter on Agrolait and save the filter.
+                            <b>To create a new filter:</b><br/>
+                            - Go to your "Related Document Model" page and set the filter parameters in the "Search" view (Example of filter based on Leads/Opportunities: Sales Team Contains Sales Department)<br/>
+                            - In this same "Search" view, select the menu "Save Current Filter", enter the name (Ex: Sales Department) and add the option "Share with all users"
+The filter must therefore be available in this page.
                         </p>
                     </div>
                     <field name='gdocs_template_url' placeholder="https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcua4/edit" required="1"/>

From b25b6cb314e1db8958958e2b88cea3c35643cfa6 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Wed, 3 Apr 2013 18:30:54 +0530
Subject: [PATCH 33/61] [IMP] google_docs : changes for warning if google
 account not configured

bzr revid: rpr@tinyerp.com-20130403130054-4s77waguv2vp8ih0
---
 addons/google_docs/google_docs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 5a72febee8e..63b78cf1f75 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -82,7 +82,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/Users/Synchronization tab."))
+            raise osv.except_osv(_('Google Drive Error!'), _("Check your google account configuration in Users/Users/Google Account."))
         _logger.info('Logged into google docs as %s', user_config['user'])
         return client
 

From 811e51f362228c89bac8d7f438a3dbd66e82941c Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Thu, 4 Apr 2013 12:35:23 +0530
Subject: [PATCH 34/61] [IMP] google_docs : changes for google template
 creation for user

bzr revid: rpr@tinyerp.com-20130404070523-3wt0hcot93jw6fop
---
 addons/google_docs/google_docs.py           | 13 ++++++-----
 addons/google_docs/res_config_user_view.xml | 24 ++++-----------------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 63b78cf1f75..824a9ddf06b 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -132,8 +132,11 @@ class google_docs_ir_attachment(osv.osv):
         # check if a model is configured with a template
         config_ids = pool_gdoc_config.search(cr, uid, [('model_id', '=', res_model)], context=context)
         configs = []
-        for config  in pool_gdoc_config.browse(cr, uid, config_ids, context=context):
+        for config  in pool_gdoc_config.browse(cr, SUPERUSER_ID, config_ids, context=context):
             if config.filter_id:
+                if (config.filter_id.user_id and config.filter_id.user_id.id != uid):
+                    #Private
+                    continue
                 google_doc_configs = self._filter(cr, uid, config, config.filter_id, res_id, context=context)
                 if google_doc_configs: 
                     configs.append({'id': config.id, 'name': config.name})
@@ -158,7 +161,7 @@ class google_docs_ir_attachment(osv.osv):
         pool_gdoc_config = self.pool.get('google.docs.config')
         pool_model = self.pool.get("ir.model")
         attachment = {'url': False}
-        config = pool_gdoc_config.browse(cr, uid, config_id, context=context)
+        config = pool_gdoc_config.browse(cr, SUPERUSER_ID, config_id, context=context)
         if config:
             res_model = config.model_id
             model_ids = pool_model.search(cr, uid, [('model','=',res_model)])
@@ -220,11 +223,11 @@ class config(osv.osv):
             }
 
     def onchange_model_id(self, cr, uid, ids, model_id, context=None):
-         res = {}
+         res = {'domain':{'filter_id':[]}}
          if model_id:
-            res['domain'] = {'filter_id': [('model_id', '=', model_id), ('user_id','=',False)]}
+            res['domain'] = {'filter_id': [('model_id', '=', model_id)]}
          else:
-             res['value'] = {'filter_id': [('user_id','=',False)]}
+             res['value'] = {'filter_id': False}
          return res
 
     _defaults = {
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 9a0a07dc590..8125a46ae7e 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -25,12 +25,11 @@
                     <field name="model_id" on_change="onchange_model_id(model_id)"/>
                     <label for='filter_id'/>
                     <div>
-                        <field name='filter_id' context="{'default_user_id': False, 'default_model_id': model_id, 'hide_user_field': True}" domain="[('user_id','=',False)]"/>
+                        <field name='filter_id'/>
                         <p class="oe_grey">
                             <b>To create a new filter:</b><br/>
-                            - Go to your "Related Document Model" page and set the filter parameters in the "Search" view (Example of filter based on Leads/Opportunities: Sales Team Contains Sales Department)<br/>
-                            - In this same "Search" view, select the menu "Save Current Filter", enter the name (Ex: Sales Department) and add the option "Share with all users"
-The filter must therefore be available in this page.
+                            - Go to the OpenERP document you want to filter. For instance, go to Opportunities and search on Sales Department.<br/>
+                            - In this same "Search" view, select the menu "Save Current Filter", enter the name (Ex: Sales Department) 
                         </p>
                     </div>
                     <field name='gdocs_template_url' placeholder="https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcua4/edit" required="1"/>
@@ -60,11 +59,7 @@ The filter must therefore be available in this page.
               <p class="oe_view_nocontent_create">
                Click to add a new template.
               </p><p>
-                Link your google drive template to any record of OpenERP.
-                If you have really specific documents you want your collaborator fill in,
-                e.g. 
-                Using a spreadsheet to control the quality of your product, reviewing the delivery checklist for each delivery order in a foreign country in a document...
-                Its very easy to manage them by adding a Google Drive template in OpenERP to link your specific document to any records.
+                Link your own google drive templates to any record of OpenERP. If you have really specific documents you want your collaborator fill in, e.g. Use a spreadsheet to control the quality of your product or review the delivery checklist for each order in a foreign country, ... Its very easy to manage them, link them to OpenERP and use them to collaborate with your employees.
               </p>
             </field>
         </record>
@@ -84,17 +79,6 @@ The filter must therefore be available in this page.
         </field>
     </record>
 
-        <record id="inherited_ir_filters_view" model="ir.ui.view">
-        <field name="name">filters</field>
-        <field name="model">ir.filters</field>
-        <field name="inherit_id" ref="base.ir_filters_view_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='user_id']" position="replace">
-                <field name="user_id" invisible="context.get('hide_user_field', False)"/>
-            </xpath>
-        </field>
-    </record>
-
         <menuitem name='Google Drive configuration' id='menu_gdocs_config' parent='base.menu_administration'/>
         <menuitem id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config'/>
     </data>

From bedf4120883af69c0b1b16c5e3ed0cd1b102aa81 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Thu, 4 Apr 2013 15:26:19 +0530
Subject: [PATCH 35/61] [IMP] google_docs : changes for tooltip of filter

bzr revid: rpr@tinyerp.com-20130404095619-lrvwxdc3w42pdaki
---
 addons/google_base_account/google_base_account_view.xml | 4 ++--
 addons/google_docs/google_docs.py                       | 2 +-
 addons/google_docs/res_config_user_view.xml             | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/google_base_account/google_base_account_view.xml b/addons/google_base_account/google_base_account_view.xml
index 366c39f6414..d46a7cb9b27 100644
--- a/addons/google_base_account/google_base_account_view.xml
+++ b/addons/google_base_account/google_base_account_view.xml
@@ -23,8 +23,8 @@
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='preferences']" position="after">
                         <group string="Google Account" colspan="4">
-                            <field name="gmail_user"/>
-                            <field name="gmail_password" password="True"/>
+                            <field name="gmail_user" readonly="0"/>
+                            <field name="gmail_password" password="True" readonly="0"/>
                         </group>
                 </xpath>
             </field>
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 824a9ddf06b..b81b69b7e44 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -161,7 +161,7 @@ class google_docs_ir_attachment(osv.osv):
         pool_gdoc_config = self.pool.get('google.docs.config')
         pool_model = self.pool.get("ir.model")
         attachment = {'url': False}
-        config = pool_gdoc_config.browse(cr, SUPERUSER_ID, config_id, context=context)
+        config = pool_gdoc_config.browse(cr, uid, config_id, context=context)
         if config:
             res_model = config.model_id
             model_ids = pool_model.search(cr, uid, [('model','=',res_model)])
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 8125a46ae7e..d253956201f 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -29,7 +29,10 @@
                         <p class="oe_grey">
                             <b>To create a new filter:</b><br/>
                             - Go to the OpenERP document you want to filter. For instance, go to Opportunities and search on Sales Department.<br/>
-                            - In this same "Search" view, select the menu "Save Current Filter", enter the name (Ex: Sales Department) 
+                            - In this "Search" view, select the option "Save Current Filter", enter the name (Ex: Sales Department)<br/>
+                            - If you select "Share with all users", link of google document in "More" options will appear for all users in opportunities of Sales Department.<br/>
+                            - If you don't select "Share with all users", link of google document in "More" options will not appear for other users in opportunities of Sales Department.<br/>
+                            - If filter is not specified, link of google document will appear in "More" option for all users for all opportunities.
                         </p>
                     </div>
                     <field name='gdocs_template_url' placeholder="https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcua4/edit" required="1"/>

From 4ed6734b82f199952f672a812478b283342125ed Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Thu, 4 Apr 2013 15:37:59 +0530
Subject: [PATCH 36/61] [IMP] google_docs :change for user

bzr revid: rpr@tinyerp.com-20130404100759-5h0olj38rpkxhj6g
---
 addons/google_docs/google_docs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index b81b69b7e44..824a9ddf06b 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -161,7 +161,7 @@ class google_docs_ir_attachment(osv.osv):
         pool_gdoc_config = self.pool.get('google.docs.config')
         pool_model = self.pool.get("ir.model")
         attachment = {'url': False}
-        config = pool_gdoc_config.browse(cr, uid, config_id, context=context)
+        config = pool_gdoc_config.browse(cr, SUPERUSER_ID, config_id, context=context)
         if config:
             res_model = config.model_id
             model_ids = pool_model.search(cr, uid, [('model','=',res_model)])

From 32352d06953c5b64c2aa91002262ae5efcb5ecbf Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Thu, 9 May 2013 19:40:01 +0530
Subject: [PATCH 37/61] [FiX] added OAuth , google account login through OAuth

bzr revid: pga@tinyerp.com-20130509141001-s9gtsdfnwxlgvsls
---
 addons/google_docs/__openerp__.py            |   7 +-
 addons/google_docs/google_docs.py            | 149 ++++----------
 addons/google_docs/res_config_user_view.xml  |  12 ++
 addons/google_docs/static/lib/gapi/client.js |   7 +
 addons/google_docs/static/src/js/gdocs.js    | 204 +++++++++++++------
 5 files changed, 204 insertions(+), 175 deletions(-)
 create mode 100644 addons/google_docs/static/lib/gapi/client.js

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 8f304e071a6..657b30258c3 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -27,7 +27,10 @@
     'category': 'Tools',
     'installable': True,
     'auto_install': False,
-    'js': ['static/src/js/gdocs.js'],
+    'js': [
+           'static/lib/gapi/client.js',
+           'static/src/js/gdocs.js',
+           ],
 #    'qweb': ['static/src/xml/gdocs.xml'],
     'data': [
         'security/ir.model.access.csv',
@@ -36,7 +39,7 @@
     'demo': [
         'google_docs_demo.xml'
     ],
-    'depends': ['google_base_account','crm'],
+    'depends': ['crm'],
     'description': """
 Integrate Google document with OpenERP.
 =======================================
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 138d7afe44f..69188fe8c85 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -28,92 +28,9 @@ from urlparse import urlparse
 
 _logger = logging.getLogger(__name__)
 
-try:
-    import gdata.docs.data
-    import gdata.docs.client
-
-    # API breakage madness in the gdata API - those guys are insane. 
-    try:
-        # gdata 2.0.15+
-        gdata.docs.client.DocsClient.copy_resource
-    except AttributeError:
-        # gdata 2.0.14- : copy_resource() was copy()
-        gdata.docs.client.DocsClient.copy_resource = gdata.docs.client.DocsClient.copy
-
-    try:
-        # gdata 2.0.16+
-        gdata.docs.client.DocsClient.get_resource_by_id
-    except AttributeError:
-        try:
-            # gdata 2.0.15+
-            gdata.docs.client.DocsClient.get_resource_by_self_link
-            def get_resource_by_id_2_0_16(self, resource_id, **kwargs):
-                return self.GetResourceBySelfLink(
-                    gdata.docs.client.RESOURCE_FEED_URI + ('/%s' % resource_id), **kwargs)
-            gdata.docs.client.DocsClient.get_resource_by_id = get_resource_by_id_2_0_16
-        except AttributeError:
-            # gdata 2.0.14- : alias get_resource_by_id()
-            gdata.docs.client.DocsClient.get_resource_by_id = gdata.docs.client.DocsClient.get_doc
-
-    try:
-        import atom.http_interface
-        _logger.info('GData lib version `%s` detected' % atom.http_interface.USER_AGENT)
-    except (ImportError, AttributeError):
-        _logger.debug('GData lib version could not be detected', exc_info=True)
-
-except ImportError:
-    _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'
-
-    def _auth(self, cr, uid, context=None):
-        '''
-        Connexion with google base account
-        @return client object for connexion
-        '''
-        #pool the google.login in google_base_account
-        google_pool = self.pool.get('google.login')
-        #get gmail password and login. We use default_get() instead of a create() followed by a read() on the 
-        # google.login object, because it is easier. The keys 'user' and 'password' ahve to be passed in the dict
-        # but the values will be replaced by the user gmail password and login.
-        user_config = google_pool.default_get(cr, uid, {'user' : '' , 'password' : ''}, context=context)
-        #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 Drive Error!'), _("Check your google account configuration in Users/Users/Google Account."))
-        _logger.info('Logged into google docs as %s', user_config['user'])
-        return client
-
-    def copy_gdoc(self, cr, uid, res_model, res_id, name_gdocs, gdoc_template_id, context=None):
-        '''
-        copy an existing document in google docs
-           :param res_model: the object for which the google doc is created
-           :param res_id: the Id of the object for which the google doc is created
-           :param name_gdocs: the name of the future ir.attachment that will be created. Based on the google doc template foun.
-           :param gdoc_template_id: the id of the google doc document to copy
-           :return: the ID of the google document object created
-        '''
-        #login with the base account google module
-        client = self._auth(cr, uid)
-        # fetch and copy the original document
-        try:
-            doc = client.get_resource_by_id(gdoc_template_id)
-            #copy the document you choose in the configuration
-            copy_resource = client.copy_resource(doc, name_gdocs)
-        except:
-            raise osv.except_osv(_('Google Drive 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,
-            'res_id': res_id,
-            'type': 'url',
-            'name': name_gdocs,
-            'url': copy_resource.get_alternate_link().href
-        }, context=context)
-        return copy_resource.resource_id.text
-
+    
     def get_google_docs_config(self, cr, uid, res_model, res_id, context=None):
         '''
         Function called by the js, when no google doc are yet associated with a record, with the aim to create one. It
@@ -157,39 +74,37 @@ class google_docs_ir_attachment(osv.osv):
             record_ids = model.search(cr, uid, domain, context=ctx)
         return record_ids
     
-    def get_google_attachment(self, cr, uid, config_id, res_id, context=None):
-        pool_gdoc_config = self.pool.get('google.docs.config')
+class config(osv.osv):
+    _name = 'google.docs.config'
+    _description = "Google Drive templates config"
+    
+    def get_google_doc_name(self, cr, uid, ids, res_id, context=None):
         pool_model = self.pool.get("ir.model")
-        attachment = {'url': False}
-        config = pool_gdoc_config.browse(cr, SUPERUSER_ID, config_id, context=context)
-        if config:
+        res = {}
+        for config in self.browse(cr, SUPERUSER_ID, ids, context=context):
             res_model = config.model_id
             model_ids = pool_model.search(cr, uid, [('model','=',res_model)])
             if not model_ids:
-                return attachment
-            model = pool_model.browse(cr, uid, model_ids[0], context=context).name
+                continue
+            model = pool_model.browse(cr, uid, model_ids[0], context=context)
+            model_name = model.name
             filter_name = config.filter_id and config.filter_id.name or False
             record = self.pool.get(res_model).read(cr, uid, res_id, [], context=context)
-            record.update({'model': model,'filter':filter_name})
+            record.update({'model': model_name,'filter':filter_name})
             name_gdocs = config.name_template or "%(name)s_%(model)s_%(filter)s_gdrive"
             try:
                 name_gdocs = name_gdocs % record
             except:
                 raise osv.except_osv(_('Key Error!'), _("Your Google Doc Name Pattern's key does not found in object."))
-    
-            attach_ids = self.search(cr, uid, [('res_model','=',res_model),('name','=',name_gdocs),('res_id','=',res_id)])
-            if not attach_ids: 
-                google_template_id = config.gdocs_resource_id
-                attach_id = self.copy_gdoc(cr, uid, config.model_id, res_id, name_gdocs, google_template_id, context=context)
-            else:
-                attach_id = attach_ids[0] 
-            attachments = self.browse(cr, uid, attach_id, context)
-            attachment['url'] = attachments.url
-        return attachment
-
-class config(osv.osv):
-    _name = 'google.docs.config'
-    _description = "Google Drive templates config"
+            
+            attach_pool = self.pool.get("ir.attachment")
+            attach_ids = attach_pool.search(cr, uid, [('res_model','=',res_model),('name','=',name_gdocs),('res_id','=',res_id)])
+            url = False
+            if attach_ids:
+                attachment = attach_pool.browse(cr, uid, attach_ids[0], context)
+                url = attachment.url
+            res[config.id] = {'name':name_gdocs, 'url': url}
+        return res
     
     def _list_all_models(self, cr, uid, context=None):
         cr.execute("SELECT model, name from ir_model order by name")
@@ -207,20 +122,27 @@ class config(osv.osv):
                     key = url.query.split('=')[1]
                 else:
                     key = res[3]
-                res_id = resource + ":" + key
-                result[data.id] = str(res_id)
+                result[data.id] = str(key)
             except:
                 raise osv.except_osv(_('Incorrect URL!'), _("Please enter a valid URL."))
         return result
+    
+    def _client_id_get(self, cr, uid, ids, name, arg, context=None):
+        result = {}
+        for config_id in ids:
+            user = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid)
+            result[config_id] = user.company_id.google_client_id
+        return result
 
     _columns = {
         'name' : fields.char('Template Name', required=True, size=1024),
         'model_id': fields.selection(_list_all_models, 'Model', required=True),
         'filter_id' : fields.many2one('ir.filters', 'Filter'),
         'gdocs_template_url': fields.char('Template URL', required=True, size=1024),
-        'gdocs_resource_id' : fields.function(_resource_get,type="char" ,string='Resource Id',store=True),
+        'gdocs_resource_id' : fields.function(_resource_get,type="char" ,string='Resource Id'),
+        'google_client_id' : fields.function(_client_id_get,type="char" ,string='Google Client '),
         '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),
-            }
+    }
 
     def onchange_model_id(self, cr, uid, ids, model_id, context=None):
          res = {'domain':{'filter_id':[]}}
@@ -244,3 +166,10 @@ class config(osv.osv):
     ]
 
 config()
+
+
+class res_company(osv.osv):
+    _inherit = "res.company"
+    _columns = {
+        'google_client_id': fields.char('Google Client ID', size=200),
+    }
\ No newline at end of file
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index d253956201f..f4fa96b1a51 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -82,6 +82,18 @@
         </field>
     </record>
 
+		<record model="ir.ui.view" id="view_company_inherit_form2">
+			<field name="name">res.company.form.inherit</field>
+			<field name="inherit_id" ref="base.view_company_form" />
+			<field name="model">res.company</field>
+			<field name="arch" type="xml">
+				<xpath expr="//group[@name='account_grp']" position="after">
+					<group string="Google Configuration">
+						<field name='google_client_id'/>
+					</group>
+				</xpath>
+			</field>
+		</record>
         <menuitem name='Google Drive configuration' id='menu_gdocs_config' parent='base.menu_administration'/>
         <menuitem id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config'/>
     </data>
diff --git a/addons/google_docs/static/lib/gapi/client.js b/addons/google_docs/static/lib/gapi/client.js
new file mode 100644
index 00000000000..7f40ec55ef9
--- /dev/null
+++ b/addons/google_docs/static/lib/gapi/client.js
@@ -0,0 +1,7 @@
+var gapi=window.gapi=window.gapi||{};gapi._bs=new Date().getTime();(function(){var f=null,g=encodeURIComponent,k=window,m=decodeURIComponent,n="push",r="test",t="shift",u="replace",y="length",B="split",C="join";var D=k,E=document,aa=D.location,ba=function(){},ca=/\[native code\]/,G=function(a,b,c){return a[b]=a[b]||c},da=function(a){for(var b=0;b<this[y];b++)if(this[b]===a)return b;return-1},ea=function(a){a=a.sort();for(var b=[],c=void 0,d=0;d<a[y];d++){var e=a[d];e!=c&&b[n](e);c=e}return b},H=function(){var a;if((a=Object.create)&&ca[r](a))a=a(f);else{a={};for(var b in a)a[b]=void 0}return a},I=G(D,"gapi",{});var J;J=G(D,"___jsl",H());G(J,"I",0);G(J,"hel",10);var K=function(){var a=aa.href,b;if(J.dpo)b=J.h;else{b=J.h;var c=RegExp("([#].*&|[#])jsh=([^&#]*)","g"),d=RegExp("([?#].*&|[?#])jsh=([^&#]*)","g");if(a=a&&(c.exec(a)||d.exec(a)))try{b=m(a[2])}catch(e){}}return b},fa=function(a){var b=G(J,"PQ",[]);J.PQ=[];var c=b[y];if(0===c)a();else for(var d=0,e=function(){++d===c&&a()},h=0;h<c;h++)b[h](e)},L=function(a){return G(G(J,"H",H()),a,H())};var M=G(J,"perf",H()),N=G(M,"g",H()),ga=G(M,"i",H());G(M,"r",[]);H();H();var O=function(a,b,c){var d=M.r;"function"===typeof d?d(a,b,c):d[n]([a,b,c])},Q=function(a,b,c){b&&0<b[y]&&(b=P(b),c&&0<c[y]&&(b+="___"+P(c)),28<b[y]&&(b=b.substr(0,28)+(b[y]-28)),c=b,b=G(ga,"_p",H()),G(b,c,H())[a]=(new Date).getTime(),O(a,"_p",c))},P=function(a){return a[C]("__")[u](/\./g,"_")[u](/\-/g,"_")[u](/\,/g,"_")};var S=H(),T=[],U=function(a){throw Error("Bad hint"+(a?": "+a:""));};T[n](["jsl",function(a){for(var b in a)if(Object.prototype.hasOwnProperty.call(a,b)){var c=a[b];"object"==typeof c?J[b]=G(J,b,[]).concat(c):G(J,b,c)}if(b=a.u)a=G(J,"us",[]),a[n](b),(b=/^https:(.*)$/.exec(b))&&a[n]("http:"+b[1])}]);var ha=/^(\/[a-zA-Z0-9_\-]+)+$/,ia=/^[a-zA-Z0-9\-_\.!]+$/,ja=/^gapi\.loaded_[0-9]+$/,ka=/^[a-zA-Z0-9,._-]+$/,oa=function(a,b,c,d){var e=a[B](";"),h=S[e[t]()],l=f;h&&(l=h(e,b,c,d));if(!(b=!l))b=l,c=b.match(la),d=b.match(ma),b=!(d&&1===d[y]&&na[r](b)&&c&&1===c[y]);b&&U(a);return l},qa=function(a,b,c,d){a=pa(a);ja[r](c)||U("invalid_callback");b=V(b);d=d&&d[y]?V(d):f;var e=function(a){return g(a)[u](/%2C/g,",")};return[g(a.d)[u](/%2C/g,",")[u](/%2F/g,"/"),"/k=",e(a.version),"/m=",e(b),d?"/exm="+e(d):
+"","/rt=j/sv=1/d=1/ed=1",a.a?"/am="+e(a.a):"",a.b?"/rs="+e(a.b):"","/cb=",e(c)][C]("")},pa=function(a){"/"!==a.charAt(0)&&U("relative path");for(var b=a.substring(1)[B]("/"),c=[];b[y];){a=b[t]();if(!a[y]||0==a.indexOf("."))U("empty/relative directory");else if(0<a.indexOf("=")){b.unshift(a);break}c[n](a)}a={};for(var d=0,e=b[y];d<e;++d){var h=b[d][B]("="),l=m(h[0]),p=m(h[1]);2!=h[y]||(!l||!p)||(a[l]=a[l]||p)}b="/"+c[C]("/");ha[r](b)||U("invalid_prefix");c=W(a,"k",!0);d=W(a,"am");a=W(a,"rs");return{d:b,
+version:c,a:d,b:a}},V=function(a){for(var b=[],c=0,d=a[y];c<d;++c){var e=a[c][u](/\./g,"_")[u](/-/g,"_");ka[r](e)&&b[n](e)}return b[C](",")},W=function(a,b,c){a=a[b];!a&&c&&U("missing: "+b);if(a){if(ia[r](a))return a;U("invalid: "+b)}return f},na=/^https?:\/\/[a-z0-9_.-]+\.google\.com(:\d+)?\/[a-zA-Z0-9_.,!=\-\/]+$/,ma=/\/cb=/g,la=/\/\//g,ra=function(){var a=K();if(!a)throw Error("Bad hint");return a};S.m=function(a,b,c,d){(a=a[0])||U("missing_hint");return"https://apis.google.com"+qa(a,b,c,d)};var X=decodeURI("%73cript"),Y=function(a,b){for(var c=[],d=0;d<a[y];++d){var e=a[d];e&&0>da.call(b,e)&&c[n](e)}return c},sa=function(a){"loading"!=E.readyState?Z(a):E.write("<"+X+' src="'+encodeURI(a)+'"></'+X+">")},Z=function(a){var b=E.createElement(X);b.setAttribute("src",a);b.async="true";(a=E.getElementsByTagName(X)[0])?a.parentNode.insertBefore(b,a):(E.head||E.body||E.documentElement).appendChild(b)},ta=function(a,b){var c=b&&b._c;if(c)for(var d=0;d<T[y];d++){var e=T[d][0],h=T[d][1];h&&Object.prototype.hasOwnProperty.call(c,
+e)&&h(c[e],a,b)}},ua=function(a,b){$(function(){var c;c=b===K()?G(I,"_",H()):H();c=G(L(b),"_",c);a(c)})},wa=function(a,b){var c=b||{};"function"==typeof b&&(c={},c.callback=b);ta(a,c);var d=a?a[B](":"):[],e=c.h||ra(),h=G(J,"ah",H());if(!h["::"]||!d[y])va(d||[],c,e);else{for(var l=[],p=f;p=d[t]();){var v=p[B]("."),v=h[p]||h[v[1]&&"ns:"+v[0]||""]||e,s=l[y]&&l[l[y]-1]||f,z=s;if(!s||s.hint!=v)z={hint:v,c:[]},l[n](z);z.c[n](p)}var A=l[y];if(1<A){var F=c.callback;F&&(c.callback=function(){0==--A&&F()})}for(;d=
+l[t]();)va(d.c,c,d.hint)}},va=function(a,b,c){a=ea(a)||[];var d=b.callback,e=b.config,h=b.timeout,l=b.ontimeout,p=f,v=!1;if(h&&!l||!h&&l)throw"Timeout requires both the timeout parameter and ontimeout parameter to be set";var s=G(L(c),"r",[]).sort(),z=G(L(c),"L",[]).sort(),A=[].concat(s),F=function(a,b){if(v)return 0;D.clearTimeout(p);z[n].apply(z,q);var d=((I||{}).config||{}).update;d?d(e):e&&G(J,"cu",[])[n](e);if(b){Q("me0",a,A);try{ua(b,c)}finally{Q("me1",a,A)}}return 1};0<h&&(p=D.setTimeout(function(){v=
+!0;l()},h));var q=Y(a,z);if(q[y]){var q=Y(a,s),w=G(J,"CP",[]),x=w[y];w[x]=function(a){if(!a)return 0;Q("ml1",q,A);var b=function(b){w[x]=f;F(q,a)&&fa(function(){d&&d();b()})},c=function(){var a=w[x+1];a&&a()};0<x&&w[x-1]?w[x]=function(){b(c)}:b(c)};if(q[y]){var R="loaded_"+J.I++;I[R]=function(a){w[x](a);I[R]=f};a=oa(c,q,"gapi."+R,s);s[n].apply(s,q);Q("ml0",q,A);b.sync||D.___gapisync?sa(a):Z(a)}else w[x](ba)}else F(q)&&d&&d()};var $=function(a){if(J.hee&&0<J.hel)try{return a()}catch(b){J.hel--,wa("debug_error",function(){k.___jsl.hefn(b)})}else return a()};I.load=function(a,b){return $(function(){return wa(a,b)})};N.bs0=k.gapi._bs||(new Date).getTime();O("bs0");N.bs1=(new Date).getTime();O("bs1");delete k.gapi._bs;})();
+gapi.load("client",{callback:window["gapi_onload"],_c:{"jsl":{"ci":{"services":{},"deviceType":"desktop","lexps":[102,103,100,71,98,96,110,108,79,106,45,17,86,81,112,61,30],"inline":{"css":1},"report":{},"oauth-flow":{"disableOpt":true,"authUrl":"https://accounts.google.com/o/oauth2/auth","proxyUrl":"https://accounts.google.com/o/oauth2/postmessageRelay","persist":true},"isLoggedIn":true,"isPlusUser":true,"iframes":{"additnow":{"methods":["launchurl"],"url":"https://apis.google.com/additnow/additnow.html?bsv"},"shortlists":{"url":"?bsv"},"plus":{"methods":["onauth"],"url":":socialhost:/u/:session_index:/_/pages/badge?bsv"},":socialhost:":"https://plusone.google.com","recobox":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/widget/render/recobox?bsv"},"plus_followers":{"params":{"url":""},"url":":socialhost:/_/im/_/widget/render/plus/followers?bsv"},"autocomplete":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/widget/render/autocomplete?bsv"},"plus_share":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/+1/sharebutton?plusShare\u003dtrue\u0026bsv"},"savetowallet":{"url":"https://clients5.google.com/s2w/o/savetowallet?bsv"},"panoembed":{"url":"https://ssl.gstatic.com/pano/embed/?bsv"},"signin":{"methods":["onauth"],"params":{"url":""},"url":":socialhost:/:session_prefix:_/widget/render/signin?bsv"},"appcirclepicker":{"url":":socialhost:/:session_prefix:_/widget/render/appcirclepicker?bsv"},"commentcount":{"url":":socialhost:/:session_prefix:_/widget/render/commentcount?bsv"},"hangout":{"url":"https://talkgadget.google.com/:session_prefix:talkgadget/_/widget?bsv"},"plus_circle":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/widget/plus/circle?bsv"},"savetodrive":{"methods":["save"],"url":"https://drive.google.com/savetodrivebutton?usegapi\u003d1\u0026bsv"},"card":{"url":":socialhost:/:session_prefix:_/hovercard/card?bsv"},"evwidget":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/events/widget?bsv"},"zoomableimage":{"url":"https://ssl.gstatic.com/microscope/embed/?bsv"},":signuphost:":"https://plus.google.com","plusone":{"preloadUrl":["https://ssl.gstatic.com/s2/oz/images/stars/po/Publisher/sprite4-a67f741843ffc4220554c34bd01bb0bb.png"],"params":{"count":"","size":"","url":""},"url":":socialhost:/:session_prefix:_/+1/fastbutton?bsv"},"comments":{"methods":["scroll","openwindow"],"params":{"location":["search","hash"]},"url":":socialhost:/:session_prefix:_/widget/render/comments?bsv"}},"debug":{"host":"https://plusone.google.com","reportExceptionRate":0.05,"rethrowException":true},"csi":{"rate":0.01},"googleapis.config":{"mobilesignupurl":"https://m.google.com/app/plus/oob?"}},"h":"m;/_/scs/apps-static/_/js/k\u003doz.gapi.en.02N985CHyyc.O/m\u003d__features__/am\u003dIQ/rt\u003dj/d\u003d1/rs\u003dAItRSTPZZ0JVQCv9Qljsu0NQlsb1ZzD2zQ","u":"https://apis.google.com/js/client.js","hee":true,"fp":"e2aa6cd0095417dbec61deca3abed1394160dab3","dpo":false},"fp":"e2aa6cd0095417dbec61deca3abed1394160dab3","annotation":["autocomplete","profile","interactivepost"],"bimodal":["signin"]}});
\ No newline at end of file
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 5b179f41ee6..1d0fbd42be1 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -1,71 +1,149 @@
-openerp.google_docs = function(instance, m) {
-var _t = instance.web._t,
-    QWeb = instance.web.qweb;
-
+openerp.google_docs = function (instance, m) {
+    var _t = instance.web._t,
+        QWeb = instance.web.qweb;
+    
     instance.web.Sidebar.include({
-    	
-    	start: function() {
+        start: function () {
             var self = this;
-            var ids 
+            var ids
             this._super.apply(this, arguments);
             var view = self.getParent();
             var result;
-            if(view.fields_view.type == "form"){
-            	ids = []
-            	view.on("load_record", self, function(r){
-		            	ids = [r.id]
-		            	self.add_gdoc_items(view, r.id)
-            		});
+            if (view.fields_view.type == "form") {
+                ids = []
+                view.on("load_record", self, function (r) {
+                    ids = [r.id]
+                    self.add_gdoc_items(view, r.id)
+                });
+            }
+        },
+        
+        add_gdoc_items: function (view, res_id) {
+            var self = this;
+            var gdoc_item = _.indexOf(_.pluck(self.items.other, 'classname'), 'oe_share_gdoc');
+            if (gdoc_item !== -1) {
+                self.items.other.splice(gdoc_item, 1);
+            }
+            if (res_id) {
+                view.sidebar_eval_context().done(function (context) {
+                    var ds = new instance.web.DataSet(this, 'ir.attachment', context);
+                    ds.call('get_google_docs_config', [view.dataset.model, res_id, context]).done(function (r) {
+                        if (!_.isEmpty(r)) {
+                            _.each(r, function (res) {
+                                var g_item = _.indexOf(_.pluck(self.items.other, 'label'), res.name);
+                                if (g_item !== -1) {
+                                    self.items.other.splice(g_item, 1);
+                                }
+                                self.add_items('other', [{
+                                        label: res.name,
+                                        config_id: res.id,
+                                        res_id: res_id,
+                                        res_model: view.dataset.model,
+                                        callback: self.on_google_doc,
+                                        classname: 'oe_share_gdoc'
+                                    },
+                                ]);
+                            })
+                        }
+                    });
+                });
+            }
+        },
+        fetch: function(model, fields, domain, ctx){
+            return new instance.web.Model(model).query(fields).filter(domain).context(ctx).all()
+        },
+        on_google_doc: function (doc_item) {
+        	var self = this;
+        	self.config = doc_item;
+        	var loaded = self.fetch('google.docs.config',['gdocs_resource_id','google_client_id'],[['id','=',doc_item.config_id]]) 
+            .then(function(configs){
+            	var ds = new instance.web.DataSet(self, 'google.docs.config');
+                ds.call('get_google_doc_name', [[doc_item.config_id], doc_item.res_id]).done(function (r) {
+                    if (!_.isEmpty(r)) {
+                    	self.OAUTHURL = 'https://accounts.google.com/o/oauth2/auth?';
+         	            self.VALIDURL = 'https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=';
+         	            self.SCOPES = 'https://www.googleapis.com/auth/drive';
+         	            self.CLIENT_ID = configs[0].google_client_id;//'39623646228-4de6gmcai1n3mj14h08bcir2u42ln07e.apps.googleusercontent.com';
+         	            //self.GDOCS_TEMPLATE_URL = configs[0].gdocs_template_url;//'https://docs.google.com/document/d/1FOqv2iDaRcjdDz577dECgVvqhYN7bgAg3vB9M7DiCdM/edit';
+         	            self.gdoc_name = r[doc_item.config_id]['name'];
+         	            //var pattern = /(\/d\/)(.[^/]*)/;
+         	            self.GDOCS_TEMPLATE_ID = configs[0].gdocs_resource_id;//self.GDOCS_TEMPLATE_URL.match(pattern)[2];
+         	            self.gdoc_url = r[doc_item.config_id]['url'];
+         	            self.handleClientLoad();
+         	            
+                    }
+                }); 
+            });
+        },
+        
+        handleClientLoad: function () {
+            var self = this;
+            window.setTimeout(function () {
+                self.checkAuth(self)
+            }, 1);
+        },
+        
+        checkAuth: function (self) {
+            gapi.auth.authorize({
+                'client_id': self.CLIENT_ID,
+                'scope': self.SCOPES,
+                'immediate': true
+            }, function (authResult) {
+                self.handleAuthResult(self, authResult)
+            });
+        },
+        
+        handleAuthResult: function (self, authResult) {
+            if (authResult && !authResult.error) {
+                self.clientLoad(self);
+            } else {
+                gapi.auth.authorize({
+                    'client_id': self.CLIENT_ID,
+                    'scope': self.SCOPES,
+                    'immediate': false
+                },
+                    self.handleAuthResult);
+            }
+        },
+        
+        clientLoad: function (self) {
+            gapi.client.load('drive', 'v2', function () {
+            	if (self.gdoc_url == false){ 
+            		self.copyFile(self.config, self.GDOCS_TEMPLATE_ID, self.gdoc_name);
             	}
-        	},
+            	else{
+            		window.open(self.gdoc_url, '_newtab');
+            	}
+            });
+        },
         
-	      add_gdoc_items: function(view, res_id){
-	        	var self = this;
-	        	var gdoc_item = _.indexOf(_.pluck(self.items.other,'classname'),'oe_share_gdoc');
-	        	if(gdoc_item !== -1)
-	        	{
-	        		self.items.other.splice(gdoc_item,1);
-	        	}
-	        	if( res_id ){
-	                view.sidebar_eval_context().done(function (context) {
-		            var ds = new instance.web.DataSet(this, 'ir.attachment', context);
-		            ds.call('get_google_docs_config', [view.dataset.model, res_id, context]).done(function(r) {
-		            	if(!_.isEmpty(r)){
-		            	_.each(r,function(res){
-		            		var g_item = _.indexOf(_.pluck(self.items.other,'label'),res.name);
-				        	if(g_item !== -1)
-				        	{
-				        		self.items.other.splice(g_item,1);
-				        	}
-				   
-		            		self.add_items('other', [
-		                    {   label: res.name,
-		                        config_id: res.id,
-		                        callback: self.on_google_doc,
-		                        classname: 'oe_share_gdoc' },
-		                	]);
-		            	  })
-		               }
-		              });
-		            });
-		         }
-	        },
-        
-        
-	        on_google_doc: function(doc_item) {
-	            var self = this;
-	            var view = self.getParent();
-	            var ids = ( view.fields_view.type != "form" )? view.groups.get_selection().ids : [ view.datarecord.id ];
-	            if( !_.isEmpty(ids) ){
-	                view.sidebar_eval_context().done(function (context) {
-	                    var ds = new instance.web.DataSet(this, 'ir.attachment', context);
-	                    ds.call('get_google_attachment', [doc_item.config_id, view.datarecord.id, context]).done(function(res) {
-	                        window.open(res.url,"_blank");
-	                        view.reload();
-	                    })
-	                    	
-	                });
-	            }
-	        }
+        copyFile: function (config, originFileId, copyTitle) {
+            var body = {
+                'title': copyTitle
+            };
+            var request = gapi.client.drive.files.copy({
+                'fileId': originFileId,
+                'resource': body
+            });
+            request.execute(function (resp) {
+                console.log('Copy ID: ' + resp.id);
+                var get_new_file = gapi.client.drive.files.get({
+                    'fileId': resp.id
+                });
+                get_new_file.execute(function (file) {
+                	var ds = new instance.web.DataSet(self, 'ir.attachment');
+                	vals = {
+	                	'res_model': config.res_model,
+	                    'res_id': config.res_id,
+	                    'type': 'url',
+	                    'name': copyTitle,
+	                    'url': file.alternateLink
+                	}
+                    ds.call('create', [vals]).done(function (r) {
+                    	window.open(file.alternateLink, '_newtab');
+                    });
+                });
+            });
+        },
     });
-};
+};
\ No newline at end of file

From ff3fded96e208f989ee35cfc714610adc0fbc6a4 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Fri, 10 May 2013 12:05:01 +0530
Subject: [PATCH 38/61] [IMP] Improved Code

bzr revid: pga@tinyerp.com-20130510063501-szrjvvh4jhzy4x7j
---
 addons/google_docs/__openerp__.py           |   9 +-
 addons/google_docs/google_docs.py           |  82 +++++-----
 addons/google_docs/google_docs_demo.xml     |  38 ++---
 addons/google_docs/res_config_user_view.xml | 160 ++++++++++----------
 addons/google_docs/static/src/js/gdocs.js   |  72 ++++-----
 addons/google_docs/static/src/xml/gdocs.xml |  10 --
 6 files changed, 178 insertions(+), 193 deletions(-)
 delete mode 100644 addons/google_docs/static/src/xml/gdocs.xml

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 657b30258c3..220b882b53b 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -28,10 +28,9 @@
     'installable': True,
     'auto_install': False,
     'js': [
-           'static/lib/gapi/client.js',
-           'static/src/js/gdocs.js',
-           ],
-#    'qweb': ['static/src/xml/gdocs.xml'],
+        'static/lib/gapi/client.js',
+        'static/src/js/gdocs.js',
+    ],
     'data': [
         'security/ir.model.access.csv',
         'res_config_user_view.xml'
@@ -39,7 +38,7 @@
     'demo': [
         'google_docs_demo.xml'
     ],
-    'depends': ['crm'],
+    'depends': ['base_setup'],
     'description': """
 Integrate Google document with OpenERP.
 =======================================
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 69188fe8c85..f3d3ad72198 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -28,8 +28,37 @@ from urlparse import urlparse
 
 _logger = logging.getLogger(__name__)
 
-class google_docs_ir_attachment(osv.osv):
-    _inherit = 'ir.attachment'
+class config(osv.osv):
+    _name = 'google.docs.config'
+    _description = "Google Drive templates config"
+    
+    def get_google_doc_name(self, cr, uid, ids, res_id, context=None):
+        pool_model = self.pool.get("ir.model")
+        res = {}
+        for config in self.browse(cr, SUPERUSER_ID, ids, context=context):
+            res_model = config.model_id
+            model_ids = pool_model.search(cr, uid, [('model', '=', res_model)])
+            if not model_ids:
+                continue
+            model = pool_model.browse(cr, uid, model_ids[0], context=context)
+            model_name = model.name
+            filter_name = config.filter_id and config.filter_id.name or False
+            record = self.pool.get(res_model).read(cr, uid, res_id, [], context=context)
+            record.update({'model': model_name, 'filter':filter_name})
+            name_gdocs = config.name_template or "%(name)s_%(model)s_%(filter)s_gdrive"
+            try:
+                name_gdocs = name_gdocs % record
+            except:
+                raise osv.except_osv(_('Key Error!'), _("Your Google Doc Name Pattern's key does not found in object."))
+            
+            attach_pool = self.pool.get("ir.attachment")
+            attach_ids = attach_pool.search(cr, uid, [('res_model', '=', res_model), ('name', '=', name_gdocs), ('res_id', '=', res_id)])
+            url = False
+            if attach_ids:
+                attachment = attach_pool.browse(cr, uid, attach_ids[0], context)
+                url = attachment.url
+            res[config.id] = {'name':name_gdocs, 'url': url}
+        return res
     
     def get_google_docs_config(self, cr, uid, res_model, res_id, context=None):
         '''
@@ -45,11 +74,10 @@ class google_docs_ir_attachment(osv.osv):
         '''
         if not res_id:
             raise osv.except_osv(_('Google Drive Error!'), _("Creating google drive may only be done by one at a time."))
-        pool_gdoc_config = self.pool.get('google.docs.config')
         # check if a model is configured with a template
-        config_ids = pool_gdoc_config.search(cr, uid, [('model_id', '=', res_model)], context=context)
+        config_ids = self.search(cr, uid, [('model_id', '=', res_model)], context=context)
         configs = []
-        for config  in pool_gdoc_config.browse(cr, SUPERUSER_ID, config_ids, context=context):
+        for config  in self.browse(cr, SUPERUSER_ID, config_ids, context=context):
             if config.filter_id:
                 if (config.filter_id.user_id and config.filter_id.user_id.id != uid):
                     #Private
@@ -74,38 +102,6 @@ class google_docs_ir_attachment(osv.osv):
             record_ids = model.search(cr, uid, domain, context=ctx)
         return record_ids
     
-class config(osv.osv):
-    _name = 'google.docs.config'
-    _description = "Google Drive templates config"
-    
-    def get_google_doc_name(self, cr, uid, ids, res_id, context=None):
-        pool_model = self.pool.get("ir.model")
-        res = {}
-        for config in self.browse(cr, SUPERUSER_ID, ids, context=context):
-            res_model = config.model_id
-            model_ids = pool_model.search(cr, uid, [('model','=',res_model)])
-            if not model_ids:
-                continue
-            model = pool_model.browse(cr, uid, model_ids[0], context=context)
-            model_name = model.name
-            filter_name = config.filter_id and config.filter_id.name or False
-            record = self.pool.get(res_model).read(cr, uid, res_id, [], context=context)
-            record.update({'model': model_name,'filter':filter_name})
-            name_gdocs = config.name_template or "%(name)s_%(model)s_%(filter)s_gdrive"
-            try:
-                name_gdocs = name_gdocs % record
-            except:
-                raise osv.except_osv(_('Key Error!'), _("Your Google Doc Name Pattern's key does not found in object."))
-            
-            attach_pool = self.pool.get("ir.attachment")
-            attach_ids = attach_pool.search(cr, uid, [('res_model','=',res_model),('name','=',name_gdocs),('res_id','=',res_id)])
-            url = False
-            if attach_ids:
-                attachment = attach_pool.browse(cr, uid, attach_ids[0], context)
-                url = attachment.url
-            res[config.id] = {'name':name_gdocs, 'url': url}
-        return res
-    
     def _list_all_models(self, cr, uid, context=None):
         cr.execute("SELECT model, name from ir_model order by name")
         return cr.fetchall()
@@ -118,7 +114,7 @@ class config(osv.osv):
                 url = urlparse(template_url)
                 res = url.path.split('/')
                 resource = res[1]
-                if res[1]== "spreadsheet":
+                if res[1] == "spreadsheet":
                     key = url.query.split('=')[1]
                 else:
                     key = res[3]
@@ -139,8 +135,8 @@ class config(osv.osv):
         'model_id': fields.selection(_list_all_models, 'Model', required=True),
         'filter_id' : fields.many2one('ir.filters', 'Filter'),
         'gdocs_template_url': fields.char('Template URL', required=True, size=1024),
-        'gdocs_resource_id' : fields.function(_resource_get,type="char" ,string='Resource Id'),
-        'google_client_id' : fields.function(_client_id_get,type="char" ,string='Google Client '),
+        'gdocs_resource_id' : fields.function(_resource_get, type="char" , string='Resource Id'),
+        'google_client_id' : fields.function(_client_id_get, type="char" , string='Google Client '),
         '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),
     }
 
@@ -155,6 +151,7 @@ class config(osv.osv):
     _defaults = {
         'name_template': '%(name)s_%(model)s_%(filter)s_gdrive',
     }
+    
     def _check_model_id(self, cr, uid, ids, context=None):
         config_id = self.browse(cr, uid, ids[0], context=context)
         if config_id.filter_id.id and config_id.model_id != config_id.filter_id.model_id:
@@ -162,14 +159,13 @@ class config(osv.osv):
         return True
 
     _constraints = [
-        (_check_model_id, 'Model of selected filter is not matching with model of current template.', ['model_id','filter_id']),
+        (_check_model_id, 'Model of selected filter is not matching with model of current template.', ['model_id', 'filter_id']),
     ]
 
 config()
 
-
 class res_company(osv.osv):
     _inherit = "res.company"
     _columns = {
-        'google_client_id': fields.char('Google Client ID', size=200),
+        'google_client_id': fields.char('Google Client ID', size=200, help="Go to 'Google APIs console' and create 'OAuth 2.0 Client ID'."),
     }
\ No newline at end of file
diff --git a/addons/google_docs/google_docs_demo.xml b/addons/google_docs/google_docs_demo.xml
index b877e45aefa..d0f75e36ba6 100644
--- a/addons/google_docs/google_docs_demo.xml
+++ b/addons/google_docs/google_docs_demo.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <openerp>
-    <data noupdate="1">
+	<data noupdate="1">
 
-<!-- filter demo  -->    
-      <record id="filter_crm" model="ir.filters">
-          <field name="name">Sales Department</field>
-          <field name="model_id">crm.lead</field>
-          <field name="domain">[['section_id', '=', 1]]</field>
-          <field name="context">{'lang': 'en_US', 'tz': 'Europe/Brussels'}</field> 
-          <field name="user_id" eval="False"/>
-      </record>    
+		<!-- filter demo -->
+		<record id="filter_partner" model="ir.filters">
+			<field name="name">Supplier</field>
+			<field name="model_id">res.partner</field>
+			<field name="domain">[['supplier', '=', 1]]</field>
+			<field name="context">{'lang': 'en_US', 'tz': 'Europe/Brussels'}</field>
+			<field name="user_id" eval="False" />
+		</record>
 
-<!-- template demo -->
-      <record id="template_crm" model="google.docs.config">
-      	  <field name="name">Sales Department Opportunities</field>
-          <field name="model_id">crm.lead</field>
-          <field name="filter_id" ref="filter_crm"/>
-          <field name="gdocs_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
-          <field name="name_template">%(name)s_%(model)s_%(filter)s_gdrive</field>
-      </record>
-      
-    </data>
+		<!-- template demo -->
+		<record id="template_partner" model="google.docs.config">
+			<field name="name">Supplier Docs</field>
+			<field name="model_id">res.partner</field>
+			<field name="filter_id" ref="filter_partner"/>
+			<field name="gdocs_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
+			<field name="name_template">%(name)s_%(model)s_%(filter)s_gdrive</field>
+		</record>
+
+	</data>
 </openerp>
 
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index f4fa96b1a51..abf394f052a 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -1,86 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+	<data>
 
-        <!-- add google docs config field in user form -->
+		<!-- add google docs config field in user form -->
 
-        <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="arch" type="xml">
-                <tree string="Google Drive Configuration">
-                	<field name="name"/>
-                    <field name="model_id"/>
-                </tree>
-            </field>
-        </record>
+		<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="arch" type="xml">
+				<tree string="Google Drive Configuration">
+					<field name="name" />
+					<field name="model_id" />
+				</tree>
+			</field>
+		</record>
 
-        <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="arch" type="xml">
-                <form string="Google Drive Configuration" version="7.0">
-                <group>
-                	<field name="name"/>
-                    <field name="model_id" on_change="onchange_model_id(model_id)"/>
-                    <label for='filter_id'/>
-                    <div>
-                        <field name='filter_id'/>
-                        <p class="oe_grey">
-                            <b>To create a new filter:</b><br/>
-                            - Go to the OpenERP document you want to filter. For instance, go to Opportunities and search on Sales Department.<br/>
-                            - In this "Search" view, select the option "Save Current Filter", enter the name (Ex: Sales Department)<br/>
-                            - If you select "Share with all users", link of google document in "More" options will appear for all users in opportunities of Sales Department.<br/>
-                            - If you don't select "Share with all users", link of google document in "More" options will not appear for other users in opportunities of Sales Department.<br/>
-                            - If filter is not specified, link of google document will appear in "More" option for all users for all opportunities.
-                        </p>
-                    </div>
-                    <field name='gdocs_template_url' placeholder="https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcua4/edit" required="1"/>
-                    <field name='gdocs_resource_id' invisible="1"/>
-                    <label for='name_template'/>
-                    <div>
-                    	<field name='name_template'/>
-                    	<p class="oe_grey">
-                    		The name of the attached document can use fixed or variable data. To distinguish between documents in
-					Google Drive, use fixed words and fields. For instance, in the example above, if you wrote Agrolait_%%(name)s_Sales
-					in the Google Drive name field, the document in your Google Drive and in OpenERP attachment will be named
-					'Agrolait_SO0001_Sales'.
-                    	</p>
-                    </div>
-                </group>
-                </form>
-            </field>
-        </record>
+		<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="arch" type="xml">
+				<form string="Google Drive Configuration" version="7.0">
+					<group>
+						<field name="name" />
+						<field name="model_id" on_change="onchange_model_id(model_id)" />
+						<label for='filter_id' />
+						<div>
+							<field name='filter_id' />
+							<p class="oe_grey">
+	                            <b>To create a new filter:</b><br/>
+	                            - Go to the OpenERP document you want to filter. For instance, go to Opportunities and search on Sales Department.<br/>
+	                            - In this "Search" view, select the option "Save Current Filter", enter the name (Ex: Sales Department)<br/>
+	                            - If you select "Share with all users", link of google document in "More" options will appear for all users in opportunities of Sales Department.<br/>
+	                            - If you don't select "Share with all users", link of google document in "More" options will not appear for other users in opportunities of Sales Department.<br/>
+	                            - If filter is not specified, link of google document will appear in "More" option for all users for all opportunities.
+                            </p>
+						</div>
+						<field name='gdocs_template_url' placeholder="https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcua4/edit" required="1" />
+						<field name='gdocs_resource_id' invisible="1" />
+						<label for='name_template' />
+						<div>
+							<field name='name_template' />
+							<p class="oe_grey">
+	                            The name of the attached document can use fixed or variable data. To distinguish between documents in
+	                            Google Drive, use fixed words and fields. For instance, in the example above, if you wrote Agrolait_%%(name)s_Sales
+	                            in the Google Drive name field, the document in your Google Drive and in OpenERP attachment will be named
+	                            'Agrolait_SO0001_Sales'.
+                            </p>
+						</div>
+					</group>
+				</form>
+			</field>
+		</record>
 
-        <record model='ir.actions.act_window' id='action_google_docs_users_config'>
-            <field name='name'>Google Drive Templates</field>
-            <field name='res_model'>google.docs.config</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_google_docs_config_tree'/>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-               Click to add a new template.
-              </p><p>
-                Link your own google drive templates to any record of OpenERP. If you have really specific documents you want your collaborator fill in, e.g. Use a spreadsheet to control the quality of your product or review the delivery checklist for each order in a foreign country, ... Its very easy to manage them, link them to OpenERP and use them to collaborate with your employees.
-              </p>
-            </field>
-        </record>
+		<record model='ir.actions.act_window' id='action_google_docs_users_config'>
+			<field name='name'>Google Drive Templates</field>
+			<field name='res_model'>google.docs.config</field>
+			<field name='type'>ir.actions.act_window</field>
+			<field name='view_type'>form</field>
+			<field name='view_id' ref='view_google_docs_config_tree' />
+			<field name="help" type="html">
+				<p class="oe_view_nocontent_create">
+					Click to add a new template.
+				</p>
+				<p>
+                    Link your own google drive templates to any record of OpenERP. If you have really specific documents you want your collaborator fill in, e.g. Use a spreadsheet to control the quality of your product or review the delivery checklist for each order in a foreign country, ... Its very easy to manage them, link them to OpenERP and use them to collaborate with your employees.
+                </p>
+			</field>
+		</record>
 
-        <record id="inherited_google_view_general_configuration" model="ir.ui.view">
-        <field name="name">General Settings</field>
-        <field name="model">base.config.settings</field>
-        <field name="inherit_id" ref="base_setup.view_general_configuration"/>
-        <field name="arch" type="xml">
-          <xpath expr="//div[@name='google_docs']" position="after">
-            <div attrs="{'invisible': [('module_google_docs','=',False)]}">
-                <button type="action"
-                name="%(google_docs.action_google_docs_users_config)d"
-                string="Configure Template" class="oe_link"/>
-            </div>
-          </xpath>
-        </field>
-    </record>
+		<record id="inherited_google_view_general_configuration" model="ir.ui.view">
+			<field name="name">General Settings</field>
+			<field name="model">base.config.settings</field>
+			<field name="inherit_id" ref="base_setup.view_general_configuration" />
+			<field name="arch" type="xml">
+				<xpath expr="//div[@name='google_docs']" position="after">
+					<div attrs="{'invisible': [('module_google_docs','=',False)]}">
+						<button type="action" name="%(google_docs.action_google_docs_users_config)d" string="Configure Template" class="oe_link" />
+					</div>
+				</xpath>
+			</field>
+		</record>
 
 		<record model="ir.ui.view" id="view_company_inherit_form2">
 			<field name="name">res.company.form.inherit</field>
@@ -89,12 +88,13 @@
 			<field name="arch" type="xml">
 				<xpath expr="//group[@name='account_grp']" position="after">
 					<group string="Google Configuration">
-						<field name='google_client_id'/>
+						<field name='google_client_id' />
 					</group>
 				</xpath>
 			</field>
 		</record>
-        <menuitem name='Google Drive configuration' id='menu_gdocs_config' parent='base.menu_administration'/>
-        <menuitem id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config'/>
-    </data>
+		
+		<menuitem name='Google Drive configuration' id='menu_gdocs_config' parent='base.menu_administration' />
+		<menuitem id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config' />
+	</data>
 </openerp>
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 1d0fbd42be1..c4769bed4dd 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -26,7 +26,7 @@ openerp.google_docs = function (instance, m) {
             }
             if (res_id) {
                 view.sidebar_eval_context().done(function (context) {
-                    var ds = new instance.web.DataSet(this, 'ir.attachment', context);
+                    var ds = new instance.web.DataSet(this, 'google.docs.config', context);
                     ds.call('get_google_docs_config', [view.dataset.model, res_id, context]).done(function (r) {
                         if (!_.isEmpty(r)) {
                             _.each(r, function (res) {
@@ -49,30 +49,29 @@ openerp.google_docs = function (instance, m) {
                 });
             }
         },
-        fetch: function(model, fields, domain, ctx){
+        
+        fetch: function (model, fields, domain, ctx) {
             return new instance.web.Model(model).query(fields).filter(domain).context(ctx).all()
         },
+        
         on_google_doc: function (doc_item) {
-        	var self = this;
-        	self.config = doc_item;
-        	var loaded = self.fetch('google.docs.config',['gdocs_resource_id','google_client_id'],[['id','=',doc_item.config_id]]) 
-            .then(function(configs){
-            	var ds = new instance.web.DataSet(self, 'google.docs.config');
+            var self = this;
+            self.config = doc_item;
+            var loaded = self.fetch('google.docs.config', ['gdocs_resource_id', 'google_client_id'], [['id', '=', doc_item.config_id]])
+                .then(function (configs) {
+                var ds = new instance.web.DataSet(self, 'google.docs.config');
                 ds.call('get_google_doc_name', [[doc_item.config_id], doc_item.res_id]).done(function (r) {
                     if (!_.isEmpty(r)) {
-                    	self.OAUTHURL = 'https://accounts.google.com/o/oauth2/auth?';
-         	            self.VALIDURL = 'https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=';
-         	            self.SCOPES = 'https://www.googleapis.com/auth/drive';
-         	            self.CLIENT_ID = configs[0].google_client_id;//'39623646228-4de6gmcai1n3mj14h08bcir2u42ln07e.apps.googleusercontent.com';
-         	            //self.GDOCS_TEMPLATE_URL = configs[0].gdocs_template_url;//'https://docs.google.com/document/d/1FOqv2iDaRcjdDz577dECgVvqhYN7bgAg3vB9M7DiCdM/edit';
-         	            self.gdoc_name = r[doc_item.config_id]['name'];
-         	            //var pattern = /(\/d\/)(.[^/]*)/;
-         	            self.GDOCS_TEMPLATE_ID = configs[0].gdocs_resource_id;//self.GDOCS_TEMPLATE_URL.match(pattern)[2];
-         	            self.gdoc_url = r[doc_item.config_id]['url'];
-         	            self.handleClientLoad();
-         	            
+                        self.OAUTHURL = 'https://accounts.google.com/o/oauth2/auth?';
+                        self.VALIDURL = 'https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=';
+                        self.SCOPES = 'https://www.googleapis.com/auth/drive';
+                        self.CLIENT_ID = configs[0].google_client_id;
+                        self.GDOC_NAME = r[doc_item.config_id]['name'];
+                        self.GDOCS_TEMPLATE_ID = configs[0].gdocs_resource_id;
+                        self.GDOC_URL = r[doc_item.config_id]['url'];
+                        self.handleClientLoad();
                     }
-                }); 
+                });
             });
         },
         
@@ -94,6 +93,7 @@ openerp.google_docs = function (instance, m) {
         },
         
         handleAuthResult: function (self, authResult) {
+        	
             if (authResult && !authResult.error) {
                 self.clientLoad(self);
             } else {
@@ -101,19 +101,19 @@ openerp.google_docs = function (instance, m) {
                     'client_id': self.CLIENT_ID,
                     'scope': self.SCOPES,
                     'immediate': false
-                },
-                    self.handleAuthResult);
+                },function (authResult) {
+                    self.handleAuthResult(self, authResult)
+                });
             }
         },
         
         clientLoad: function (self) {
             gapi.client.load('drive', 'v2', function () {
-            	if (self.gdoc_url == false){ 
-            		self.copyFile(self.config, self.GDOCS_TEMPLATE_ID, self.gdoc_name);
-            	}
-            	else{
-            		window.open(self.gdoc_url, '_newtab');
-            	}
+                if (self.GDOC_URL == false) {
+                    self.copyFile(self.config, self.GDOCS_TEMPLATE_ID, self.GDOC_NAME);
+                } else {
+                    window.open(self.GDOC_URL, '_blank');
+                }
             });
         },
         
@@ -131,16 +131,16 @@ openerp.google_docs = function (instance, m) {
                     'fileId': resp.id
                 });
                 get_new_file.execute(function (file) {
-                	var ds = new instance.web.DataSet(self, 'ir.attachment');
-                	vals = {
-	                	'res_model': config.res_model,
-	                    'res_id': config.res_id,
-	                    'type': 'url',
-	                    'name': copyTitle,
-	                    'url': file.alternateLink
-                	}
+                    var ds = new instance.web.DataSet(self, 'ir.attachment');
+                    vals = {
+                        'res_model': config.res_model,
+                        'res_id': config.res_id,
+                        'type': 'url',
+                        'name': copyTitle,
+                        'url': file.alternateLink
+                    }
                     ds.call('create', [vals]).done(function (r) {
-                    	window.open(file.alternateLink, '_newtab');
+                        window.open(file.alternateLink, '_blank');
                     });
                 });
             });
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_docs/static/src/xml/gdocs.xml
deleted file mode 100644
index a90f4034ea8..00000000000
--- a/addons/google_docs/static/src/xml/gdocs.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
-<!-- <templates id="template" xml:space="preserve">
-<t t-name="AddGoogleDocumentItem">
-	 <t t-foreach="widget" t-as="item">
-	 		<li class="oe_gdoc_action_a"><span><t t-esc="item"/></span></li>
-     </t>
-</t>
-</templates> -->
\ No newline at end of file

From 482fb99ffd0a9cf43978f38e9b325d2b17fbf23b Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Fri, 10 May 2013 14:43:33 +0530
Subject: [PATCH 39/61] [IMP] Improved Code

bzr revid: pga@tinyerp.com-20130510091333-gmn2gwdo48jglsfu
---
 addons/google_docs/google_docs_demo.xml     |  36 ++--
 addons/google_docs/res_config_user_view.xml | 174 ++++++++++----------
 2 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/addons/google_docs/google_docs_demo.xml b/addons/google_docs/google_docs_demo.xml
index d0f75e36ba6..fb452bf68e8 100644
--- a/addons/google_docs/google_docs_demo.xml
+++ b/addons/google_docs/google_docs_demo.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">
+    <data noupdate="1">
 
-		<!-- filter demo -->
-		<record id="filter_partner" model="ir.filters">
-			<field name="name">Supplier</field>
-			<field name="model_id">res.partner</field>
-			<field name="domain">[['supplier', '=', 1]]</field>
-			<field name="context">{'lang': 'en_US', 'tz': 'Europe/Brussels'}</field>
-			<field name="user_id" eval="False" />
-		</record>
+        <!-- filter demo -->
+        <record id="filter_partner" model="ir.filters">
+            <field name="name">Supplier</field>
+            <field name="model_id">res.partner</field>
+            <field name="domain">[['supplier', '=', 1]]</field>
+            <field name="context">{'lang': 'en_US', 'tz': 'Europe/Brussels'}</field>
+            <field name="user_id" eval="False" />
+        </record>
 
-		<!-- template demo -->
-		<record id="template_partner" model="google.docs.config">
-			<field name="name">Supplier Docs</field>
-			<field name="model_id">res.partner</field>
-			<field name="filter_id" ref="filter_partner"/>
-			<field name="gdocs_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
-			<field name="name_template">%(name)s_%(model)s_%(filter)s_gdrive</field>
-		</record>
+        <!-- template demo -->
+        <record id="template_partner" model="google.docs.config">
+            <field name="name">Supplier Docs</field>
+            <field name="model_id">res.partner</field>
+            <field name="filter_id" ref="filter_partner"/>
+            <field name="gdocs_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
+            <field name="name_template">%(name)s_%(model)s_%(filter)s_gdrive</field>
+        </record>
 
-	</data>
+    </data>
 </openerp>
 
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index abf394f052a..93f37ce8d09 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -1,100 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
+    <data>
 
-		<!-- add google docs config field in user form -->
+        <!-- add google docs config field in user form -->
 
-		<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="arch" type="xml">
-				<tree string="Google Drive Configuration">
-					<field name="name" />
-					<field name="model_id" />
-				</tree>
-			</field>
-		</record>
+        <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="arch" type="xml">
+                <tree string="Google Drive Configuration">
+                    <field name="name" />
+                    <field name="model_id" />
+                </tree>
+            </field>
+        </record>
 
-		<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="arch" type="xml">
-				<form string="Google Drive Configuration" version="7.0">
-					<group>
-						<field name="name" />
-						<field name="model_id" on_change="onchange_model_id(model_id)" />
-						<label for='filter_id' />
-						<div>
-							<field name='filter_id' />
-							<p class="oe_grey">
-	                            <b>To create a new filter:</b><br/>
-	                            - Go to the OpenERP document you want to filter. For instance, go to Opportunities and search on Sales Department.<br/>
-	                            - In this "Search" view, select the option "Save Current Filter", enter the name (Ex: Sales Department)<br/>
-	                            - If you select "Share with all users", link of google document in "More" options will appear for all users in opportunities of Sales Department.<br/>
-	                            - If you don't select "Share with all users", link of google document in "More" options will not appear for other users in opportunities of Sales Department.<br/>
-	                            - If filter is not specified, link of google document will appear in "More" option for all users for all opportunities.
+        <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="arch" type="xml">
+                <form string="Google Drive Configuration" version="7.0">
+                    <group>
+                        <field name="name" />
+                        <field name="model_id" on_change="onchange_model_id(model_id)" />
+                        <label for='filter_id' />
+                        <div>
+                            <field name='filter_id' />
+                            <p class="oe_grey">
+                                <b>To create a new filter:</b><br/>
+                                - Go to the OpenERP document you want to filter. For instance, go to Opportunities and search on Sales Department.<br/>
+                                - In this "Search" view, select the option "Save Current Filter", enter the name (Ex: Sales Department)<br/>
+                                - If you select "Share with all users", link of google document in "More" options will appear for all users in opportunities of Sales Department.<br/>
+                                - If you don't select "Share with all users", link of google document in "More" options will not appear for other users in opportunities of Sales Department.<br/>
+                                - If filter is not specified, link of google document will appear in "More" option for all users for all opportunities.
                             </p>
-						</div>
-						<field name='gdocs_template_url' placeholder="https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcua4/edit" required="1" />
-						<field name='gdocs_resource_id' invisible="1" />
-						<label for='name_template' />
-						<div>
-							<field name='name_template' />
-							<p class="oe_grey">
-	                            The name of the attached document can use fixed or variable data. To distinguish between documents in
-	                            Google Drive, use fixed words and fields. For instance, in the example above, if you wrote Agrolait_%%(name)s_Sales
-	                            in the Google Drive name field, the document in your Google Drive and in OpenERP attachment will be named
-	                            'Agrolait_SO0001_Sales'.
+                        </div>
+                        <field name='gdocs_template_url' placeholder="https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcua4/edit" required="1" />
+                        <field name='gdocs_resource_id' invisible="1" />
+                        <label for='name_template' />
+                        <div>
+                            <field name='name_template' />
+                            <p class="oe_grey">
+                                The name of the attached document can use fixed or variable data. To distinguish between documents in
+                                Google Drive, use fixed words and fields. For instance, in the example above, if you wrote Agrolait_%%(name)s_Sales
+                                in the Google Drive name field, the document in your Google Drive and in OpenERP attachment will be named
+                                'Agrolait_SO0001_Sales'.
                             </p>
-						</div>
-					</group>
-				</form>
-			</field>
-		</record>
+                        </div>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<record model='ir.actions.act_window' id='action_google_docs_users_config'>
-			<field name='name'>Google Drive Templates</field>
-			<field name='res_model'>google.docs.config</field>
-			<field name='type'>ir.actions.act_window</field>
-			<field name='view_type'>form</field>
-			<field name='view_id' ref='view_google_docs_config_tree' />
-			<field name="help" type="html">
-				<p class="oe_view_nocontent_create">
-					Click to add a new template.
-				</p>
-				<p>
+        <record model='ir.actions.act_window' id='action_google_docs_users_config'>
+            <field name='name'>Google Drive Templates</field>
+            <field name='res_model'>google.docs.config</field>
+            <field name='type'>ir.actions.act_window</field>
+            <field name='view_type'>form</field>
+            <field name='view_id' ref='view_google_docs_config_tree' />
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to add a new template.
+                </p>
+                <p>
                     Link your own google drive templates to any record of OpenERP. If you have really specific documents you want your collaborator fill in, e.g. Use a spreadsheet to control the quality of your product or review the delivery checklist for each order in a foreign country, ... Its very easy to manage them, link them to OpenERP and use them to collaborate with your employees.
                 </p>
-			</field>
-		</record>
+            </field>
+        </record>
 
-		<record id="inherited_google_view_general_configuration" model="ir.ui.view">
-			<field name="name">General Settings</field>
-			<field name="model">base.config.settings</field>
-			<field name="inherit_id" ref="base_setup.view_general_configuration" />
-			<field name="arch" type="xml">
-				<xpath expr="//div[@name='google_docs']" position="after">
-					<div attrs="{'invisible': [('module_google_docs','=',False)]}">
-						<button type="action" name="%(google_docs.action_google_docs_users_config)d" string="Configure Template" class="oe_link" />
-					</div>
-				</xpath>
-			</field>
-		</record>
+        <record id="inherited_google_view_general_configuration" model="ir.ui.view">
+            <field name="name">General Settings</field>
+            <field name="model">base.config.settings</field>
+            <field name="inherit_id" ref="base_setup.view_general_configuration" />
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='google_docs']" position="after">
+                    <div attrs="{'invisible': [('module_google_docs','=',False)]}">
+                        <button type="action" name="%(google_docs.action_google_docs_users_config)d" string="Configure Template" class="oe_link" />
+                    </div>
+                </xpath>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_company_inherit_form2">
-			<field name="name">res.company.form.inherit</field>
-			<field name="inherit_id" ref="base.view_company_form" />
-			<field name="model">res.company</field>
-			<field name="arch" type="xml">
-				<xpath expr="//group[@name='account_grp']" position="after">
-					<group string="Google Configuration">
-						<field name='google_client_id' />
-					</group>
-				</xpath>
-			</field>
-		</record>
-		
-		<menuitem name='Google Drive configuration' id='menu_gdocs_config' parent='base.menu_administration' />
-		<menuitem id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config' />
-	</data>
+        <record model="ir.ui.view" id="view_company_inherit_form2">
+            <field name="name">res.company.form.inherit</field>
+            <field name="inherit_id" ref="base.view_company_form" />
+            <field name="model">res.company</field>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='account_grp']" position="after">
+                    <group string="Google Configuration">
+                        <field name='google_client_id' />
+                    </group>
+                </xpath>
+            </field>
+        </record>
+        
+        <menuitem name='Google Drive configuration' id='menu_gdocs_config' parent='base.menu_administration' />
+        <menuitem id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config' />
+    </data>
 </openerp>

From d1dc5368edc97f35938b7198d1e0621fae1d30a8 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Fri, 17 May 2013 15:49:31 +0530
Subject: [PATCH 40/61] [ADD] Added open with option from drive, Added
 Documentation for Drive Integration, Added Discription In Google Docs Detail

bzr revid: pga@tinyerp.com-20130517101931-ep3fmv5tdtcuddtx
---
 addons/google_docs/static/src/js/gdocs.js | 60 ++++++++++++++++++-----
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index c4769bed4dd..0e0a633ab1c 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -1,7 +1,7 @@
 openerp.google_docs = function (instance, m) {
     var _t = instance.web._t,
         QWeb = instance.web.qweb;
-    
+
     instance.web.Sidebar.include({
         start: function () {
             var self = this;
@@ -9,6 +9,7 @@ openerp.google_docs = function (instance, m) {
             this._super.apply(this, arguments);
             var view = self.getParent();
             var result;
+            this.check_url();
             if (view.fields_view.type == "form") {
                 ids = []
                 view.on("load_record", self, function (r) {
@@ -17,7 +18,36 @@ openerp.google_docs = function (instance, m) {
                 });
             }
         },
-        
+        check_url: function () {
+            /* This function check URL and if there is 'state' object (dictionary) sent by google,
+             * it will fetch file 'exportIds' from 'state' object and redirect to corresponding record in openerp
+             */ 
+            self = this;
+            var state = this.getUrlVars();
+            if (state) {
+                file_obj = JSON.parse(state);
+                var loaded = self.fetch('ir.attachment', ['res_model', 'res_id', 'url', 'name'], [['url', 'ilike', '%' + file_obj.exportIds[0] + '%']])
+                    .then(function (att) {
+                    console.log(att);
+                    if (att.length != 0) {
+                        url = window.location.href.replace(/(\&)(.*)/, "");
+                        url = url + "#id=" + att[0].res_id + "&model=" + att[0].res_model;
+                        $('body').hide();
+                        window.open(url, '_self');
+                    }
+                });
+            }
+        },
+        getUrlVars: function () {
+            var parts=unescape(window.location.href);
+            var n=parts.match(/(state=)(.*})/);
+            if(n && n.length>2){
+                return n[2];
+            }
+            else{
+                return false
+            }
+        },
         add_gdoc_items: function (view, res_id) {
             var self = this;
             var gdoc_item = _.indexOf(_.pluck(self.items.other, 'classname'), 'oe_share_gdoc');
@@ -49,11 +79,11 @@ openerp.google_docs = function (instance, m) {
                 });
             }
         },
-        
+
         fetch: function (model, fields, domain, ctx) {
             return new instance.web.Model(model).query(fields).filter(domain).context(ctx).all()
         },
-        
+
         on_google_doc: function (doc_item) {
             var self = this;
             self.config = doc_item;
@@ -64,7 +94,7 @@ openerp.google_docs = function (instance, m) {
                     if (!_.isEmpty(r)) {
                         self.OAUTHURL = 'https://accounts.google.com/o/oauth2/auth?';
                         self.VALIDURL = 'https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=';
-                        self.SCOPES = 'https://www.googleapis.com/auth/drive';
+                        self.SCOPES = 'https://www.googleapis.com/auth/drive https://www.googleapis.com/auth/drive.install';
                         self.CLIENT_ID = configs[0].google_client_id;
                         self.GDOC_NAME = r[doc_item.config_id]['name'];
                         self.GDOCS_TEMPLATE_ID = configs[0].gdocs_resource_id;
@@ -74,14 +104,14 @@ openerp.google_docs = function (instance, m) {
                 });
             });
         },
-        
+
         handleClientLoad: function () {
             var self = this;
             window.setTimeout(function () {
                 self.checkAuth(self)
             }, 1);
         },
-        
+
         checkAuth: function (self) {
             gapi.auth.authorize({
                 'client_id': self.CLIENT_ID,
@@ -91,9 +121,9 @@ openerp.google_docs = function (instance, m) {
                 self.handleAuthResult(self, authResult)
             });
         },
-        
+
         handleAuthResult: function (self, authResult) {
-        	
+
             if (authResult && !authResult.error) {
                 self.clientLoad(self);
             } else {
@@ -101,12 +131,12 @@ openerp.google_docs = function (instance, m) {
                     'client_id': self.CLIENT_ID,
                     'scope': self.SCOPES,
                     'immediate': false
-                },function (authResult) {
+                }, function (authResult) {
                     self.handleAuthResult(self, authResult)
                 });
             }
         },
-        
+
         clientLoad: function (self) {
             gapi.client.load('drive', 'v2', function () {
                 if (self.GDOC_URL == false) {
@@ -116,10 +146,14 @@ openerp.google_docs = function (instance, m) {
                 }
             });
         },
-        
+
         copyFile: function (config, originFileId, copyTitle) {
+            discription = window.location.href;
+            discription = discription.replace(/(\&)?menu_id(.*)/, "");
+            discription = discription.replace(/(\&)?action(.*)/, "");
             var body = {
-                'title': copyTitle
+                'title': copyTitle,
+                "description": 'Click Below link for open record in OpenERP\n' + discription,
             };
             var request = gapi.client.drive.files.copy({
                 'fileId': originFileId,

From b4e6c2109c715c66e14e6f99446fda6da7e5b433 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Wed, 22 May 2013 15:58:57 +0530
Subject: [PATCH 42/61] [IMP]Google client id in ir.config_parameter

bzr revid: pga@tinyerp.com-20130522102857-fehfsdks1fq3zc1i
---
 addons/google_docs/google_docs.py           | 10 ++--------
 addons/google_docs/google_docs_demo.xml     |  6 +++++-
 addons/google_docs/res_config_user_view.xml | 14 +-------------
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index f3d3ad72198..aea5ec35037 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -126,8 +126,8 @@ class config(osv.osv):
     def _client_id_get(self, cr, uid, ids, name, arg, context=None):
         result = {}
         for config_id in ids:
-            user = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid)
-            result[config_id] = user.company_id.google_client_id
+            config = self.pool['ir.config_parameter']
+            result[config_id] = config.get_param(cr, SUPERUSER_ID, 'google_client_id')
         return result
 
     _columns = {
@@ -163,9 +163,3 @@ class config(osv.osv):
     ]
 
 config()
-
-class res_company(osv.osv):
-    _inherit = "res.company"
-    _columns = {
-        'google_client_id': fields.char('Google Client ID', size=200, help="Go to 'Google APIs console' and create 'OAuth 2.0 Client ID'."),
-    }
\ No newline at end of file
diff --git a/addons/google_docs/google_docs_demo.xml b/addons/google_docs/google_docs_demo.xml
index fb452bf68e8..b37f8713ec9 100644
--- a/addons/google_docs/google_docs_demo.xml
+++ b/addons/google_docs/google_docs_demo.xml
@@ -19,7 +19,11 @@
             <field name="gdocs_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
             <field name="name_template">%(name)s_%(model)s_%(filter)s_gdrive</field>
         </record>
-
+        
+         <record id="template_google_client_id" model="ir.config_parameter">
+            <field name="key">google_client_id</field>
+            <field name="value">-</field>
+        </record>
     </data>
 </openerp>
 
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 93f37ce8d09..3e875ddc897 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -81,19 +81,7 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_company_inherit_form2">
-            <field name="name">res.company.form.inherit</field>
-            <field name="inherit_id" ref="base.view_company_form" />
-            <field name="model">res.company</field>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='account_grp']" position="after">
-                    <group string="Google Configuration">
-                        <field name='google_client_id' />
-                    </group>
-                </xpath>
-            </field>
-        </record>
-        
+
         <menuitem name='Google Drive configuration' id='menu_gdocs_config' parent='base.menu_administration' />
         <menuitem id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config' />
     </data>

From 5b9b00631de5020bd5560fe788eab7a703815253 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Thu, 23 May 2013 16:11:55 +0530
Subject: [PATCH 43/61] [ADD] Added OAuth integration through python, Added
 Documentation

bzr revid: pga@tinyerp.com-20130523104155-83gmp2gucvackppv
---
 addons/google_docs/__openerp__.py             |   3 +-
 addons/google_docs/google_docs.py             |  67 +++++++++-
 addons/google_docs/google_docs_data.xml       |  26 ++++
 addons/google_docs/google_docs_demo.xml       |   4 -
 addons/google_docs/res_config_user_view.xml   |  34 ++++-
 .../google_docs/static/src/img/drive_icon.png | Bin 0 -> 2148 bytes
 .../static/src/img/drive_icon_mono.png        | Bin 0 -> 479 bytes
 addons/google_docs/static/src/js/gdocs.js     | 123 ++----------------
 8 files changed, 134 insertions(+), 123 deletions(-)
 create mode 100644 addons/google_docs/google_docs_data.xml
 create mode 100644 addons/google_docs/static/src/img/drive_icon.png
 create mode 100644 addons/google_docs/static/src/img/drive_icon_mono.png

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 220b882b53b..fcbc008fd36 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -33,7 +33,8 @@
     ],
     'data': [
         'security/ir.model.access.csv',
-        'res_config_user_view.xml'
+        'res_config_user_view.xml',
+        'google_docs_data.xml'
     ],
     'demo': [
         'google_docs_demo.xml'
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index aea5ec35037..4059ed9117f 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -26,13 +26,17 @@ from openerp.osv import fields, osv
 from openerp.tools.translate import _
 from urlparse import urlparse
 
+from httplib2 import Http
+import urllib
+import json
+
 _logger = logging.getLogger(__name__)
 
 class config(osv.osv):
     _name = 'google.docs.config'
     _description = "Google Drive templates config"
     
-    def get_google_doc_name(self, cr, uid, ids, res_id, context=None):
+    def get_google_doc_name(self, cr, uid, ids, res_id, tamplate_id, context=None):
         pool_model = self.pool.get("ir.model")
         res = {}
         for config in self.browse(cr, SUPERUSER_ID, ids, context=context):
@@ -57,7 +61,41 @@ class config(osv.osv):
             if attach_ids:
                 attachment = attach_pool.browse(cr, uid, attach_ids[0], context)
                 url = attachment.url
-            res[config.id] = {'name':name_gdocs, 'url': url}
+            else:
+                url = self.copy_doc(cr, uid, ids, res_id, tamplate_id, name_gdocs, res_model, context)
+            res[config.id] = {'url': url}
+        return res
+    
+    def copy_doc(self, cr, uid, ids, res_id, tamplate_id, name_gdocs, res_model, context=None):
+        ir_config = self.pool[ 'ir.config_parameter' ]
+        google_client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_client_id')
+        google_client_secret = ir_config.get_param(cr, SUPERUSER_ID, 'google_client_secret')
+        google_refresh_token = ir_config.get_param(cr, SUPERUSER_ID, 'google_refresh_token')
+        google_web_base_url = ir_config.get_param(cr, SUPERUSER_ID, 'web.base.url')
+        
+        #For Getting New Access Token With help of old Refresh Token 
+        headers = {"Content-type": "application/x-www-form-urlencoded"}
+        data = dict(client_id = google_client_id, 
+                    refresh_token = google_refresh_token, 
+                    client_secret = google_client_secret, 
+                    grant_type = "refresh_token")
+        data = urllib.urlencode(data) 
+        resp, content = Http().request("https://accounts.google.com/o/oauth2/token", "POST", data, headers)
+        content = json.loads(content)
+        
+        # Copy template in to drive with help of new access token
+        headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
+        record_url = "Click on link to open Record in OpenERP\n %s/?db=%s#id=%s&model=%s" %(google_web_base_url, cr.dbname, res_id, res_model ) 
+        data = {"title": name_gdocs, "description": record_url}
+        request_url = "https://www.googleapis.com/drive/v2/files/%s/copy?access_token=%s" % (tamplate_id, content['access_token'])
+        resp, content = Http().request(request_url, "POST", json.dumps(data), headers)
+        content = json.loads(content)
+        res = False
+        if 'alternateLink' in content.keys():
+            attach_pool = self.pool.get("ir.attachment")
+            attach_vals = {'res_model': res_model, 'name': name_gdocs, 'res_id': res_id, 'type': 'url', 'url':content['alternateLink']}
+            attach_pool.create(cr, uid, attach_vals)
+            res = content['alternateLink']
         return res
     
     def get_google_docs_config(self, cr, uid, res_model, res_id, context=None):
@@ -163,3 +201,28 @@ class config(osv.osv):
     ]
 
 config()
+
+class res_users(osv.osv):
+    _inherit = "res.users"
+    
+    def onchange_authorization_code(self, cr, uid, ids, authorization_code, context=None):
+        res = {}
+        if authorization_code:
+            ir_config = self.pool['ir.config_parameter']
+            google_client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_client_id')
+            google_client_secret = ir_config.get_param(cr, SUPERUSER_ID, 'google_client_secret')
+            google_redirect_uri = ir_config.get_param(cr, SUPERUSER_ID, 'google_redirect_uri')
+            
+            #Get the Refresh Token From Google And store it in ir.config_parameter 
+            headers = {"Content-type": "application/x-www-form-urlencoded"}
+            data = dict(code=authorization_code, client_id=google_client_id, client_secret=google_client_secret,redirect_uri=google_redirect_uri,grant_type="authorization_code")
+            data = urllib.urlencode(data) 
+            resp, content = Http().request("https://accounts.google.com/o/oauth2/token", "POST", data,headers)
+            content=json.loads(content)
+            if 'refresh_token' in content.keys():
+                ir_config.set_param(cr, uid, 'google_refresh_token', content['refresh_token'])
+        return res
+
+    _columns = {
+        'authorization_code': fields.char('Authorization Code', size=124),
+    }
\ No newline at end of file
diff --git a/addons/google_docs/google_docs_data.xml b/addons/google_docs/google_docs_data.xml
new file mode 100644
index 00000000000..ea8d5dcd8ba
--- /dev/null
+++ b/addons/google_docs/google_docs_data.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+  
+         <record id="config_google_client_id" model="ir.config_parameter">
+            <field name="key">google_client_id</field>
+            <field name="value">39623646228-eg3ggo3mk6o40m7rguobi3rkl9frh4tb.apps.googleusercontent.com</field>
+        </record>
+        
+        <record id="config_google_client_secret" model="ir.config_parameter">
+            <field name="key">google_client_secret</field>
+            <field name="value">Ul-PtmnSWs3euWs20fdono0e</field>
+        </record>
+
+        <record id="config_google_redirect_uri" model="ir.config_parameter">
+            <field name="key">google_redirect_uri</field>
+            <field name="value">urn:ietf:wg:oauth:2.0:oob</field>
+        </record>
+
+        <record id="config_refresh_token" model="ir.config_parameter">
+            <field name="key">google_refresh_token</field>
+            <field name="value">-</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/google_docs/google_docs_demo.xml b/addons/google_docs/google_docs_demo.xml
index b37f8713ec9..df2daee6ccd 100644
--- a/addons/google_docs/google_docs_demo.xml
+++ b/addons/google_docs/google_docs_demo.xml
@@ -20,10 +20,6 @@
             <field name="name_template">%(name)s_%(model)s_%(filter)s_gdrive</field>
         </record>
         
-         <record id="template_google_client_id" model="ir.config_parameter">
-            <field name="key">google_client_id</field>
-            <field name="value">-</field>
-        </record>
     </data>
 </openerp>
 
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 3e875ddc897..ea796ee34b8 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -80,7 +80,39 @@
                 </xpath>
             </field>
         </record>
-
+        
+        <record id="view_users_gogole_form" model="ir.ui.view">
+            <field name="name">res.users.google.form1</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook" position="inside">
+                    <page string="Google Authorization Code" attrs="{'invisible': [('id', '!=', 1)]}">
+                        <group string="Google Authorization Code">
+                            <group >
+                                <field name="authorization_code" on_change="onchange_authorization_code(authorization_code)"/>
+                            </group>
+                            <group>
+                                <a href="https://accounts.google.com/o/oauth2/auth?scope=https://www.googleapis.com/auth/drive&amp;redirect_uri=urn:ietf:wg:oauth:2.0:oob&amp;response_type=code&amp;client_id=39623646228-eg3ggo3mk6o40m7rguobi3rkl9frh4tb.apps.googleusercontent.com" target="_blank" class="oe_link"><b>Generate Authorization Code</b></a>
+                            </group>
+                        </group>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+        <record id="view_users_gogole_preference" model="ir.ui.view">
+            <field name="name">res.users.google.form2</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='preferences']" position="after">
+                        <group string="Google Account" attrs="{'invisible': [('id', '!=', 1)]}">
+                            <field name="authorization_code" on_change="onchange_authorization_code(authorization_code)"/>
+                            <a href="https://accounts.google.com/o/oauth2/auth?scope=https://www.googleapis.com/auth/drive&amp;redirect_uri=urn:ietf:wg:oauth:2.0:oob&amp;response_type=code&amp;client_id=39623646228-eg3ggo3mk6o40m7rguobi3rkl9frh4tb.apps.googleusercontent.com" target="_blank" class="oe_link"><b>Generate Authorization Code</b></a>
+                        </group>
+                </xpath>
+            </field>
+        </record>
 
         <menuitem name='Google Drive configuration' id='menu_gdocs_config' parent='base.menu_administration' />
         <menuitem id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config' />
diff --git a/addons/google_docs/static/src/img/drive_icon.png b/addons/google_docs/static/src/img/drive_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..590dde867f4bd46b2d836b9e5e8a8e2940b13ff0
GIT binary patch
literal 2148
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
a?!aG7`ph;%20c*#0000<MNUMnLSTZ+6!g^q

literal 0
HcmV?d00001

diff --git a/addons/google_docs/static/src/img/drive_icon_mono.png b/addons/google_docs/static/src/img/drive_icon_mono.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fd836b69889a1d9482c6684ab2912e13f334f3b
GIT binary patch
literal 479
zcmV<50U-W~P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0004|Nkl<ZXx{Bv
z+l_-T5cJRK@|hASff8H-B~U_2a0e-Y5-5QZD8VJ91kOl4DMEx`&+M8gSejq#S?^;!
zm}#2KC&QcsP68kSWc~bJt^tpL3BcWySYhKjpb5Bv1ZGqv2n+!}-hu}S4BCfppEh>^
zmT(J=*5Q{CpKG8B=s^Nri-23%ypJT%TX52cuQs}leL*e-^S7^(1h&#-B(>E}>hOCC
zwOtf=F02HBac>I57JHnwnmDZPq_)~J+h%HB&&A#yqM&0$lT(0H&<;I(jZ9WTTg7w|
zSd2b?ql`|95k#X`lM33RdM5`x=_b>45<7QQb<!KXlf9XmP9pSgzqXNzPLiIWB%M^F
zdIxHGVta^3NAi}nbv(V!GWAZj@QR&o0MRge^v#r7gq&n~L-{oaS|XM-x$|odn7%z}
za^p3Z8AXPn#nD9>dCamDdCD~54e;+ij0Ff-#w)BP+3Nh)*^YNG>%lJfK7KQqEn#xY
zIusib?nskc-XmJcah7eU=h7{@j3YS}dOqn>pJ#bI`c8G6wB_~At9AaVKM8y}fj>!$
VuqZz|_#XfO002ovPDHLkV1f~F(Eb1b

literal 0
HcmV?d00001

diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 0e0a633ab1c..505815f4b2e 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -9,7 +9,6 @@ openerp.google_docs = function (instance, m) {
             this._super.apply(this, arguments);
             var view = self.getParent();
             var result;
-            this.check_url();
             if (view.fields_view.type == "form") {
                 ids = []
                 view.on("load_record", self, function (r) {
@@ -18,36 +17,6 @@ openerp.google_docs = function (instance, m) {
                 });
             }
         },
-        check_url: function () {
-            /* This function check URL and if there is 'state' object (dictionary) sent by google,
-             * it will fetch file 'exportIds' from 'state' object and redirect to corresponding record in openerp
-             */ 
-            self = this;
-            var state = this.getUrlVars();
-            if (state) {
-                file_obj = JSON.parse(state);
-                var loaded = self.fetch('ir.attachment', ['res_model', 'res_id', 'url', 'name'], [['url', 'ilike', '%' + file_obj.exportIds[0] + '%']])
-                    .then(function (att) {
-                    console.log(att);
-                    if (att.length != 0) {
-                        url = window.location.href.replace(/(\&)(.*)/, "");
-                        url = url + "#id=" + att[0].res_id + "&model=" + att[0].res_model;
-                        $('body').hide();
-                        window.open(url, '_self');
-                    }
-                });
-            }
-        },
-        getUrlVars: function () {
-            var parts=unescape(window.location.href);
-            var n=parts.match(/(state=)(.*})/);
-            if(n && n.length>2){
-                return n[2];
-            }
-            else{
-                return false
-            }
-        },
         add_gdoc_items: function (view, res_id) {
             var self = this;
             var gdoc_item = _.indexOf(_.pluck(self.items.other, 'classname'), 'oe_share_gdoc');
@@ -65,7 +34,7 @@ openerp.google_docs = function (instance, m) {
                                     self.items.other.splice(g_item, 1);
                                 }
                                 self.add_items('other', [{
-                                        label: res.name,
+                                        label: res.name+ '<img style="height:20px;width:20px;float:right;" src="google_docs/static/src/img/drive_icon.png"/>',
                                         config_id: res.id,
                                         res_id: res_id,
                                         res_model: view.dataset.model,
@@ -90,94 +59,18 @@ openerp.google_docs = function (instance, m) {
             var loaded = self.fetch('google.docs.config', ['gdocs_resource_id', 'google_client_id'], [['id', '=', doc_item.config_id]])
                 .then(function (configs) {
                 var ds = new instance.web.DataSet(self, 'google.docs.config');
-                ds.call('get_google_doc_name', [[doc_item.config_id], doc_item.res_id]).done(function (r) {
+                ds.call('get_google_doc_name', [[doc_item.config_id], doc_item.res_id,configs[0].gdocs_resource_id]).done(function (r) {
                     if (!_.isEmpty(r)) {
-                        self.OAUTHURL = 'https://accounts.google.com/o/oauth2/auth?';
-                        self.VALIDURL = 'https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=';
-                        self.SCOPES = 'https://www.googleapis.com/auth/drive https://www.googleapis.com/auth/drive.install';
-                        self.CLIENT_ID = configs[0].google_client_id;
-                        self.GDOC_NAME = r[doc_item.config_id]['name'];
-                        self.GDOCS_TEMPLATE_ID = configs[0].gdocs_resource_id;
-                        self.GDOC_URL = r[doc_item.config_id]['url'];
-                        self.handleClientLoad();
+                        _.each(r, function (res) {
+                            if(res.url)
+                                {
+                                    window.open(res.url, '_blank');
+                                }
+                        });
                     }
                 });
             });
         },
 
-        handleClientLoad: function () {
-            var self = this;
-            window.setTimeout(function () {
-                self.checkAuth(self)
-            }, 1);
-        },
-
-        checkAuth: function (self) {
-            gapi.auth.authorize({
-                'client_id': self.CLIENT_ID,
-                'scope': self.SCOPES,
-                'immediate': true
-            }, function (authResult) {
-                self.handleAuthResult(self, authResult)
-            });
-        },
-
-        handleAuthResult: function (self, authResult) {
-
-            if (authResult && !authResult.error) {
-                self.clientLoad(self);
-            } else {
-                gapi.auth.authorize({
-                    'client_id': self.CLIENT_ID,
-                    'scope': self.SCOPES,
-                    'immediate': false
-                }, function (authResult) {
-                    self.handleAuthResult(self, authResult)
-                });
-            }
-        },
-
-        clientLoad: function (self) {
-            gapi.client.load('drive', 'v2', function () {
-                if (self.GDOC_URL == false) {
-                    self.copyFile(self.config, self.GDOCS_TEMPLATE_ID, self.GDOC_NAME);
-                } else {
-                    window.open(self.GDOC_URL, '_blank');
-                }
-            });
-        },
-
-        copyFile: function (config, originFileId, copyTitle) {
-            discription = window.location.href;
-            discription = discription.replace(/(\&)?menu_id(.*)/, "");
-            discription = discription.replace(/(\&)?action(.*)/, "");
-            var body = {
-                'title': copyTitle,
-                "description": 'Click Below link for open record in OpenERP\n' + discription,
-            };
-            var request = gapi.client.drive.files.copy({
-                'fileId': originFileId,
-                'resource': body
-            });
-            request.execute(function (resp) {
-                console.log('Copy ID: ' + resp.id);
-                var get_new_file = gapi.client.drive.files.get({
-                    'fileId': resp.id
-                });
-                get_new_file.execute(function (file) {
-                    var ds = new instance.web.DataSet(self, 'ir.attachment');
-                    vals = {
-                        'res_model': config.res_model,
-                        'res_id': config.res_id,
-                        'type': 'url',
-                        'name': copyTitle,
-                        'url': file.alternateLink
-                    }
-                    ds.call('create', [vals]).done(function (r) {
-                        window.open(file.alternateLink, '_blank');
-                    });
-                });
-            });
-        },
     });
 };
\ No newline at end of file

From ba97e0cdc2131cdbcc9bb2739ec1670cd209be74 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Thu, 23 May 2013 19:08:48 +0530
Subject: [PATCH 44/61] [IMP] Moved Google Authorization Code to General
 Setting

bzr revid: pga@tinyerp.com-20130523133848-0i3j6h3rzj5a66pd
---
 addons/google_docs/google_docs.py           |  15 ++++++++--
 addons/google_docs/google_docs_data.xml     |   4 +++
 addons/google_docs/res_config_user_view.xml |  29 ++------------------
 addons/google_docs/static/src/img/icon.png  | Bin 0 -> 12538 bytes
 4 files changed, 18 insertions(+), 30 deletions(-)
 create mode 100644 addons/google_docs/static/src/img/icon.png

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 4059ed9117f..c570ac5dd33 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -202,8 +202,8 @@ class config(osv.osv):
 
 config()
 
-class res_users(osv.osv):
-    _inherit = "res.users"
+class base_config_settings(osv.osv):
+    _inherit = "base.config.settings"
     
     def onchange_authorization_code(self, cr, uid, ids, authorization_code, context=None):
         res = {}
@@ -222,7 +222,16 @@ class res_users(osv.osv):
             if 'refresh_token' in content.keys():
                 ir_config.set_param(cr, uid, 'google_refresh_token', content['refresh_token'])
         return res
+    
+    def get_default_authorization_code(self, cr, uid, ids, context=None):
+        authorization_code = self.pool.get("ir.config_parameter").get_param(cr, uid, "authorization_code", context=context)
+        return {'authorization_code': authorization_code}
 
+    def set_authorization_code(self, cr, uid, ids, context=None):
+        config_parameters = self.pool.get("ir.config_parameter")
+        for record in self.browse(cr, uid, ids, context=context):
+            config_parameters.set_param(cr, uid, "authorization_code", record.authorization_code or '', context=context)
+    
     _columns = {
-        'authorization_code': fields.char('Authorization Code', size=124),
+        'authorization_code': fields.char('Google Authorization Code', size=124),
     }
\ No newline at end of file
diff --git a/addons/google_docs/google_docs_data.xml b/addons/google_docs/google_docs_data.xml
index ea8d5dcd8ba..5ec29c12a7c 100644
--- a/addons/google_docs/google_docs_data.xml
+++ b/addons/google_docs/google_docs_data.xml
@@ -22,5 +22,9 @@
             <field name="value">-</field>
         </record>
 
+        <record id="config_authorization_code" model="ir.config_parameter">
+            <field name="key">authorization_code</field>
+            <field name="value">-</field>
+        </record>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index ea796ee34b8..2e3d833814b 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -76,19 +76,7 @@
                 <xpath expr="//div[@name='google_docs']" position="after">
                     <div attrs="{'invisible': [('module_google_docs','=',False)]}">
                         <button type="action" name="%(google_docs.action_google_docs_users_config)d" string="Configure Template" class="oe_link" />
-                    </div>
-                </xpath>
-            </field>
-        </record>
-        
-        <record id="view_users_gogole_form" model="ir.ui.view">
-            <field name="name">res.users.google.form1</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//notebook" position="inside">
-                    <page string="Google Authorization Code" attrs="{'invisible': [('id', '!=', 1)]}">
-                        <group string="Google Authorization Code">
+                        <group  >
                             <group >
                                 <field name="authorization_code" on_change="onchange_authorization_code(authorization_code)"/>
                             </group>
@@ -96,20 +84,7 @@
                                 <a href="https://accounts.google.com/o/oauth2/auth?scope=https://www.googleapis.com/auth/drive&amp;redirect_uri=urn:ietf:wg:oauth:2.0:oob&amp;response_type=code&amp;client_id=39623646228-eg3ggo3mk6o40m7rguobi3rkl9frh4tb.apps.googleusercontent.com" target="_blank" class="oe_link"><b>Generate Authorization Code</b></a>
                             </group>
                         </group>
-                    </page>
-                </xpath>
-            </field>
-        </record>
-        <record id="view_users_gogole_preference" model="ir.ui.view">
-            <field name="name">res.users.google.form2</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='preferences']" position="after">
-                        <group string="Google Account" attrs="{'invisible': [('id', '!=', 1)]}">
-                            <field name="authorization_code" on_change="onchange_authorization_code(authorization_code)"/>
-                            <a href="https://accounts.google.com/o/oauth2/auth?scope=https://www.googleapis.com/auth/drive&amp;redirect_uri=urn:ietf:wg:oauth:2.0:oob&amp;response_type=code&amp;client_id=39623646228-eg3ggo3mk6o40m7rguobi3rkl9frh4tb.apps.googleusercontent.com" target="_blank" class="oe_link"><b>Generate Authorization Code</b></a>
-                        </group>
+                    </div>
                 </xpath>
             </field>
         </record>
diff --git a/addons/google_docs/static/src/img/icon.png b/addons/google_docs/static/src/img/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7f64291ef99005d8c73c0f122116cb63b9454b8
GIT binary patch
literal 12538
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
Gxc>vgVX<-m

literal 0
HcmV?d00001


From c1d366480df962960da227c1c6114bd68a4d90cb Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Fri, 24 May 2013 11:35:44 +0530
Subject: [PATCH 45/61] [ADD] Added extra explanation in General Setting

bzr revid: pga@tinyerp.com-20130524060544-2v2q47t4gds4p6uz
---
 addons/google_docs/google_docs.py           |  2 +-
 addons/google_docs/res_config_user_view.xml | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index c570ac5dd33..932f8658627 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -233,5 +233,5 @@ class base_config_settings(osv.osv):
             config_parameters.set_param(cr, uid, "authorization_code", record.authorization_code or '', context=context)
     
     _columns = {
-        'authorization_code': fields.char('Google Authorization Code', size=124),
+        'authorization_code': fields.char('Paste Generated "Authorization Code" from google to here', size=124),
     }
\ No newline at end of file
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 2e3d833814b..50cb1851d07 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -75,15 +75,13 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='google_docs']" position="after">
                     <div attrs="{'invisible': [('module_google_docs','=',False)]}">
-                        <button type="action" name="%(google_docs.action_google_docs_users_config)d" string="Configure Template" class="oe_link" />
-                        <group  >
-                            <group >
-                                <field name="authorization_code" on_change="onchange_authorization_code(authorization_code)"/>
-                            </group>
+                        <p class="oe_gray" >
+                            Click here to <a href="https://accounts.google.com/o/oauth2/auth?scope=https://www.googleapis.com/auth/drive&amp;redirect_uri=urn:ietf:wg:oauth:2.0:oob&amp;response_type=code&amp;client_id=39623646228-eg3ggo3mk6o40m7rguobi3rkl9frh4tb.apps.googleusercontent.com" target="_blank"><b>Generate Google Authorization Code</b></a><br/>
                             <group>
-                                <a href="https://accounts.google.com/o/oauth2/auth?scope=https://www.googleapis.com/auth/drive&amp;redirect_uri=urn:ietf:wg:oauth:2.0:oob&amp;response_type=code&amp;client_id=39623646228-eg3ggo3mk6o40m7rguobi3rkl9frh4tb.apps.googleusercontent.com" target="_blank" class="oe_link"><b>Generate Authorization Code</b></a>
+                                <field  name="authorization_code" on_change="onchange_authorization_code(authorization_code)"/>
                             </group>
-                        </group>
+                            Configure your templates and link your google document to OpenERP records <button type="action" name="%(google_docs.action_google_docs_users_config)d" string="Configure Template" class="oe_link" />
+                        </p>
                     </div>
                 </xpath>
             </field>

From 0fec1053f3ef27da8e09d54d6ba5817ab716eb32 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Wed, 29 May 2013 12:37:23 +0530
Subject: [PATCH 47/61] [IMP] Added alert, Changed logo

bzr revid: pga@tinyerp.com-20130529070723-ruz42rqh798h4w0a
---
 addons/google_docs/__openerp__.py          |   2 +-
 addons/google_docs/google_docs.py          |  29 ++++++++++++---------
 addons/google_docs/static/src/img/icon.png | Bin 12538 -> 19252 bytes
 addons/google_docs/static/src/js/gdocs.js  |   2 +-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index fcbc008fd36..6b7f28116ec 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Google Drive integration',
+    'name': 'Google Drive™ integration',
     'version': '0.2',
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 932f8658627..e97f0d929f1 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -84,18 +84,23 @@ class config(osv.osv):
         content = json.loads(content)
         
         # Copy template in to drive with help of new access token
-        headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
-        record_url = "Click on link to open Record in OpenERP\n %s/?db=%s#id=%s&model=%s" %(google_web_base_url, cr.dbname, res_id, res_model ) 
-        data = {"title": name_gdocs, "description": record_url}
-        request_url = "https://www.googleapis.com/drive/v2/files/%s/copy?access_token=%s" % (tamplate_id, content['access_token'])
-        resp, content = Http().request(request_url, "POST", json.dumps(data), headers)
-        content = json.loads(content)
-        res = False
-        if 'alternateLink' in content.keys():
-            attach_pool = self.pool.get("ir.attachment")
-            attach_vals = {'res_model': res_model, 'name': name_gdocs, 'res_id': res_id, 'type': 'url', 'url':content['alternateLink']}
-            attach_pool.create(cr, uid, attach_vals)
-            res = content['alternateLink']
+        if content.has_key('access_token'):
+            headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
+            record_url = "Click on link to open Record in OpenERP\n %s/?db=%s#id=%s&model=%s" %(google_web_base_url, cr.dbname, res_id, res_model ) 
+            data = {"title": name_gdocs, "description": record_url}
+            request_url = "https://www.googleapis.com/drive/v2/files/%s/copy?access_token=%s" % (tamplate_id, content['access_token'])
+            resp, content = Http().request(request_url, "POST", json.dumps(data), headers)
+            content = json.loads(content)
+            res = False
+            if 'alternateLink' in content.keys():
+                attach_pool = self.pool.get("ir.attachment")
+                attach_vals = {'res_model': res_model, 'name': name_gdocs, 'res_id': res_id, 'type': 'url', 'url':content['alternateLink']}
+                attach_pool.create(cr, uid, attach_vals)
+                res = content['alternateLink']
+        elif uid==1:
+            raise self.pool.get('res.config.settings').get_config_warning(cr, _("You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %%(menu:base_setup.menu_general_configuration)s."), context=context)
+        else:
+            raise osv.except_osv(_('Google Drive Configuration Error!'), _("'Authorization Code' is not configured yet, Please Contact Administrator"))
         return res
     
     def get_google_docs_config(self, cr, uid, res_model, res_id, context=None):
diff --git a/addons/google_docs/static/src/img/icon.png b/addons/google_docs/static/src/img/icon.png
index e7f64291ef99005d8c73c0f122116cb63b9454b8..3989ab57b30cae836cfa14fe4163ae3e5a7608d3 100644
GIT binary patch
literal 19252
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

literal 12538
zcmW+-1yIz_`~KW<ba%r^cOyt1(v5T|p_C%sc}JJh1|XqyNtYmZfJ#WJbR8`M-#f_z
z4*2`~&(6-f^Uluuy!-C6JMYZCn`&mFOG(B?1^@u1zMhsj0D%4tK>!KSKk+c2+Wns(
z_0zKp1ORgS|8)>h@Q&r5k~K)%Hps%)Jt)*AzzxuF^?mFH)%SMsa5HyvaSit$aZ>>R
zsbqaE4a=~_gXr)kj-lvPUw4ntwbV^cRAd;SL5HqM;M3A#&`+<bP7Aw7s$ZmUMQ3N;
zEh0=`(?VadQQIYAC1N$&LHFiVcVPa3)nkhf+b!uGbg7IEJYs1d^s=BDSwLz!pAVWd
zOmKB+W#Z((p?78BzvBP3;uW7~r%gS9hemKGII;|Wcqaid>(h6!<C_F8CUaUEv;jVL
z@7O!q^G6ktI8Ab@gkjm+UaHW65>Rj@{Ba5A??-_RPlnM7nmo7=9#8@ru8I#V?D6>6
zJ?nq?G7A#&fD{V3y;?8f{7>zlouLliJERBCc>#r^U1WH%$H7CfwQR482jH08aSW=2
zKI^CBN*L!y{q`kmX(vITS{eWFJ7|6-xTmsO`z^J#X7t3;n)cDk>$Tmn6eEX(XbODQ
z@@GFp=Q@|-eW}&r0Z7xz3NdlS(tnw}1iapn=q>neyxO?DE1{Myk^2}xeDf~e@w_`M
zqmjKdgF;RQ(L;Cvl#TBY94-bS+WjSTAsK)Y(@D{W=+xdtXf28sHUuCG-^DAb+?p^d
zf`>V=kF;RddjF-MXc050NxBo6-Mf^0R<7v(DdbU|{f3QK^GZe0Pctz8G%x|wpSwe)
z{|UkDW&E_zB+yV42ErZdO{M-noIHYwdxWib66F5D#PR~7h_%CPM14_A2Fa&)fGgnH
zW6@MN0;Qx45+#LD;VzCSU8B|LVIu>3a}Cd+e(2661?R#X=c2g|zfv*UAo~AJIwMdw
ztw06k#0fhf3xC1TDBon?Qj2TI-9)gq?zxW{K`cSc87ee4c8oUGg5c48fTuKI8c;6I
z)yE(yXoGnE*}yx_0Zv=Xc0p%tWeq-6PJ%fwG@_BaO90k*$zk^zEXzs6u+aC@C=L~?
z?u6<b36gq1Hs<;tT%k4=73(BE)xwhM4d)V3y_FfF=Uneeg~a)QkcTGyDg>)?cYae5
z{NbU{1zyLmC4$D)6$%FtJPFx0bR<fwIHi8f0OBkw)&zs3nn9D4rt3yqpyvF!EXWb%
zcfg#_N^_0>VLGW-2gR;d+9mzlk(Q7?%4bkXJ{m>rE-@~=mc05CS7|CKY()>O(HX05
zN*{l8AUIsO>-3B7Hv=6B2d<UiW@Zi|^)T;V5}$O~UdE>ICoV{^8ONnFp*!<49lpM2
z@>9ZmG+UhbyLvIKEw=MN$aOJX37G#J<NCNts04fuWivm$)J2rfQJG6V70uMA;|f+D
zy`b+1zo{U^9ePNxSwL!Yqbx;}#0u8-&_hcpSqVZ9hDT2Vkuns?X{y+<_qD~-j%&I4
zy?mL+1>8M#+&BF%Rcrn$oACJ7(?IpJwT={;Ug$%H3qu+ze2lMHmkCn^MIGDHs=cjY
z>u(6wqU&(FojD!-&+GNE#*qOyrZe8jV<@$R09otCJ&{lb*Ib-DV_H`~)XfJ?jjiwP
ze!Bi9qY@K}G>@C9AX3VP;C+aZ6Awz-CKFfK-&-He`8^OqoeQR8|LididmNi%F7|Id
zIVsLAj5gXdDF5*R*Zt?&y#TVDGdora=cCt@4cxEE&4h7S%=wjBLx_j><==In4?k7P
z1nzhR;Q*1Wwuzw{Km9C<@Uw`X_gefWN<8f$X=Q-j9rBuLI4p^Ar|EbB8SSsI->LhP
z-jS8CW{jSjW(~{yEH%xZcvBEkosM=sq{YuVsEJ7g3zAZtM2J)M*Z)H3Pa-M#&`VS|
zVy^jAYpACxm$@&{r8H`Zmp8ldKwmquK=wCJMkZ}^Ze=4^PY-p-n(f5$tb*`qs{m*%
z1Y3BQGAO8;yo819@b>XFj*m{LL4WNwK*z$C#veQ<<^M$=r~_6y`n=864e79)xYH0G
zj<dqvV9oRs-=%h2M3QM#1$xl8H%<&Ja$AZ#lh5Ie#RgxUo;H>KS1zUtX1V~5h+?w6
zC!?P+Jaa>O&-<#quo00P0U?+r-lVu_<Po2c7l6k3roy7H|F$<d&&nWk52C$Dpoilv
zsytKkOv*RzJ`ah1so<0JY1$?Uac>$KAp>!G5$xp&kAFA{J_~<IeTA(sr7rKg4d;y&
z(;Emy&neWtqxQaKa*mubfpoQ=LA<y87{IvP!Mlo(YzEbb(gb|>w!c%K4!+Kgljn`9
z%0c+j<BU~+B3`ZI4q1hUbOsp5{5afRuhi0W>8z8A5%&*}e072S4u}q#advQbYG1b!
zW<4os7`e(vx+TCkKYI^ce%Q2$84ygGtNhZj{gvJ*?!(&I^m7^%GJ;V5eIAKg9&I4>
zUS;^fN45EAO}p>1qb()DZX!)SdrxwoN(JwK6FLl?`5~Bj=}(8s2EdYdXPGHA2dM>W
z#PIC~l%YcyLB{|hvqCvbRK(1NHKhSTOWJp1;cky;C6=Xs#kn?W5Kz!zBhs`SQOA&*
zuZAiiUA??!b^5e|pf5_o&v+A;e1-ZqL(hXNKKsT&>PskG*>SmBTMMQy&7WUG=seFr
zUpg+dD<G47RfdEqkyvdjSUd!mQu^725mq2x{WC*B8_ekoF7MV5un@OWIY?}XmI^(D
ziKZ>-A<RSS(2w*<KbF)5r>})CJxM0auIENPCW3+%X|UpL4=q{<X+D2TCc|#q+D_fo
zuCB}67ob_Q#ulpd)lvmsz8{yaa-t{wVg%+P%_DCP{CIsecpq3>cCsk_`SW)qZ8BdW
z#GV1P0`6+LW>#Mzrss`)#h2v)N3_?VDt*W%!^0-zgV{syuSjH8c?}|YNb5}~Go}Y#
zojGM*`2}>m{y_}|p8GH&%2lsZHr1E0&-)uy)k;<F47;kgOj}}G!CjOg$lByMi)hK^
zdq1pu6!IaDF$4o7b0^pLn}M~knLJihD4iOe*``(0$;9fgu+Sp%Xtu<NE}?`F7rdk;
zz-^s}fn#<e@*726;Er@D_lOMZa^qO6khf7ENv<YsPG8`b`+x^@fEyq7bciTn#?JB5
zib<sZlch8LkPYcg#dJX4DY3UZ983!In@*_+r?`+sZM(hJq^U3mwcL$iC)N9Uo!hv*
zImf)-+!G<&y6ycNX-yA%{bNlI=dT=!5rBqWSWAyVW4qLW0xLkuI5zYS0>fQb!QmNh
z1^8wD@s7Qp7Zfug1$$oDs5(m>A6?wemnCR{D(D8nA-4w^AltXUy$0Y{P2yT$un2mu
zlf0?doIrX~Wzzivl?D?jG#13|p97ZQu}4U%&6iwWEEs^hi^#L8X1v_EBcAj;>uyrI
z9HK2qf<W)ezx@c_iQ+!%9m9-k#%aZx=O9#QvHoA*a2>>p4-)Rkjy}tq$Yu5Z`VdiX
zA>yVq_Uq$IGdmmbtbI%a_c0FA+n(o4#fU{pGJR-*Hj+WFzz`#lh9Gw~6OQNtVhHrZ
zd{-En>_&Gr2yu1<Dw*h^iyMocBx_{+S(|F6Tw8AHdt<^pvcpzl)uWECsCk=P2`eMX
zX$CV5a7vnc+L2(6);=-rmb<%^*azA7>lI&V8Z@9?D&<chbV=hwlaochBsESC(Q9u#
z#z0aL9cbVOc0!qoYU8GfXM#i!We?x5kV1E$6CGFiVpAa$ugT1`!QpqKU(&#=%aA6m
z@g2r_7-V492Yk35;vK`UAB&biJZRvo(W$Ings&WInFC14tFdpW$TiLS*<z=ABHD6b
zuWR}~S;2;w2xm^GCRRH0y-Na%=6I35cwy!xqzA{Ds~G~*8*g3<aPk57zx8#MH1!S5
zaUFV*lP^LZ7h1(N(pP_)7ZvS!zVl>%{m9dl;w=|wv^YU{>Q@}t;SNpMPAFBRUyMHA
zq0O&Q6c31&M~|J%Q{6;WY~I5g+03XrD*_Zf7rvtLQalJ<Q><tbWPg`h2{R%Ls{mi{
zy)bkVV?yt}5dt*z5RfbgsobF;=P~m!;g=<5?t_;pFa^?}f=1NbY5a4J>!0t=H;T#-
zJVV^!#p*Rvg14DGIDl{QSeA?99aBkhT^_`82!C%0mPzbn>PJ$5<=i$Vw5<Z32eIk6
zAeWLC`PDSP3l@O0u*EXcDea;1*mY6KAC`zxVU#{NpI*bl2gO?=*8d;7!J_U)uj|EA
zet`42TiMCb;h2YDDd)N42bcf&!;VyEL$w%Tlcb()3ZKFF#z7Gy5EmVqADrkq^_aG;
zkjN>zZSK+tR@jtVsDh}kwA;v9+nBxSc(7Jx0RN^qZVvjJNiLIF8IuJM1%9^@R_Foz
z(43)RXclPvOI1wC0rh<FBU-M{t;^XKp$!j!j+Zw|+`le}ztuSN=fdn6n=bVO4Vn<F
zh$YME<Xi0ba=Q>7K7fO7s_z^3uGH$~{S7Kq7ukgf75Q02elCnlDvz8ni?PtL*UQ57
zR&eMLVhLb;C78?4zaA=kT+cK?$GM^UVDO0gr$<2B!9epJ>OQQq=?<?ymnBR>fWS@q
za<gge*WqB+*6Hp8&|ygA(L00?=lpp&9_X?fh`wD|lhKK?qtlZkU3@Prdz-AQ&{T~k
zr#{h2e^F}|d-rT*j0AO}z5j_e^~Y_$KTMUdqi7=hY4HJ5&N@nGsb^!b&co{mUzQ2w
zRDX>C0m4|gD@7=T#NE5K@LR&~3mGTYVI87J%d^yP)H?3C5B{9S_`e)0ZsJCX64P00
z?I$@!EqL_ovGAc9h!SdPQWwqwu6`}?hUTqbHY9#L7_=urRZcrqZDKZ73P}M|VlCk}
zu&lo0VzSB8vDg9~x~w~3$1FoGnudGy=PEN*^-l8)tJcANV>U!B<I=KM=gH20Yh%(*
z&bRu-)>%#r_Bdi+uJrjUI%?(J2MdKuQ>*d7zR7|bAHok5qVS)9|30_B?G|<xjfrxA
zKV*8I9syQ7N3qZbj&<XYXx!+vyP-qk&A!ZF>OQ<hu@&OZbpMbpglHJ}s$r@=f();f
z3>@+C3Mp;8O5RO1t_sP7HE?9DZ~NcR-XPBE)8v=Gdq7<U$}pWH`A?CJl#f1^#{L1G
z5KqoF)SvOiC}CWa3%|&#+HKXKB)zv37HcQ<)J^kV+qJ^TNaVJr`Ur(y=$42zC{h)C
zLhE22SPkNn|H4Zq4JDh({=z!@@sON4uWSptA_A3EgNPadg*vyhFVw^P8+sXkseVv+
z#-$Po!RaF`C{yx@1eQUEb8&-lrs^|=!o%LrV-~sHzEhh7zBF7ScDeZ!9HREV_`{FE
z>!rD845qMwg7`Qs=K_kbiF6P0yUB#!59=n|SkX%%E_MkP6Dqw{W}n!iP-#)X%aHd6
z{l2#{F4EM5S~SEJ&+ca_-;Gl>J@dr)h6gZ&B#>t9d^5&y#g2aZKxtd0a!0b+pvm)U
zke)=qCWq-5aMOYjco*CzTvOI%3_WUYau%$1YJikp63u@>C?3rD;or~R=6ZnmdPJXW
z=7~UKw!Ujq-&|yl>@pOL^6EnbC<)A2%(V#T%MrmGlDXUc-uLFZiHFMg`%=)lk5M|L
zP?J{osyU_tBU7<kUqbY@#erC)3r|xVMb0txx1^}|{{T-;Gwy<1eddpL9J@}MUyAcr
zKwVUf8mL^G3$y56@Y(G~!Yy1fHq3J)mxfVh#!~Ogc_B_+$YD;V14vEdJK#v-c2e6#
z-9YdqE!abYL*plco5fLI)ijgKDJi;f2K|z^{fpP*aPqJw;X+g{MaZ=I6EF7j%_elN
zs(rs(IxEx|5Rm+`MOloDiI&^UTvgYr1bC3X*2F1aDTH<I9}t)+W?hPsbiAu4xTU`N
zFyQvHOin9Hi)>kPVM*_!6Amkw?#Jn2JH?b(%9i^mm*kgc*VNF()et??`{y!(ZqhFm
z-)G`xXSPEj0+Kjs|2FVfgU=SdaJv4I&$bmp&|*7WWqF_6PpQ3UneL2J%>oEY-tI9q
zi=Jc`w?{zgPg7b^v2UDGo69MiLgSDuuvfH&)qK<^rj@d9`|z7CvSULr`2@OeR_wz7
zsE&@-yX4W_h2NyO#-A9so&Ylg;O<)@nIQ)|r?|c9F`I#u7bKfRfhU=in<V_hpbWR}
zjlzfeq&mW4>1LO3Gw+_zz;pnPFMAdjvEy)%OQl!NiN!Pg`sCAJEcm_Vs)q7f`S?R=
zN2KB8nmW-;lIlyLz6veM%*XE#bh*1<w$v|3xcK>5{0|@bvYXgAZ_0%$KPTe2mzeYS
zwPNMb>%Rt98~3>5R|@ZD48&2t3FKX}+8FC(9TTzhb8&!2+xg~jrwOn<pu_1$Q%tV~
z^0VD(xhGLT!Jz!cNu%jnFR|Nj<<2nuF|ki(U#-3R(GavH(%}k!{nc|I>uIi>m)J!S
zBw*+Fn$SuAPkw!rAl2M+$@f7#(5FK>22vZUdS2|RR<Y)<uDjM0<Io<&&!9}l#CurB
zOMZ=e8k7Er*i~x_Xk(>+r2wKqosJpTtMWq=^I&W>Nr(xw!7{dxpD09&YCiuP1(>)p
zFh6TL^nB&Dq>lS;pQ~vmv*Y`VRnOK|OGW{`t_<$-sZ))W-cO5bkr=hUQn#PIx{-FA
zWNd!Y<^V~d3@PQOey<haQXPh{HIQn&MxOpQ_<sB}1Nh?PAwa8g{`h5#WP<dF{h?rm
zHB?+yAgXuv?1X;%A+FVOeF{^~t#?T!x&J8r^{L4p{**len3x5SU9LWOrYp18L(+Rc
z*7Qc9sL{6;%*$-AQ4+L<yxL@YmrqBK!I4Brk1$V9-_rZ`ai8oTM+o<_@A(pxmu!Fi
zqh{Jxe?F8fG@?d<;vKCn;X7`0&g`7$%%ab7Zr^dlOVM=$a~!pLE4%9W@3jcz+D;No
z?#=q1;J6N?<%@%^2e|kmncfo4l}X*?{mT?k|0}!kdor6C_RJW9BIsGq6`g|H{YQJd
z0)kv+@`>M$Z)=UvU`I}7I!tlM=9gSi+w11KreGNzz^-{|IYYyCelc>pKP~(nEjx|@
zn|lloGf%&FKR%@t%yP6=2b~Y8FZfd&vma?i<8(16cPFJ0`oc4&xN=1u?&QZWHa{Y=
zU_e;9p<B}98+edPZU(ff-yy@%V%_lk%HaH5LQOEbSxR8lNuT11U!+<efw^Jff0=(|
zqLN6e@t6n@ohw`Y!1KYBA&}7h5R%m%AAhdG{2xby<i7Y4aV#h*Za_DMS5-mcy2cuK
zT*Vq_Nh&cp^C1e(ct{-SC56=EHNWZwJrpGg)Iqoo#@TK5*H-i!b$Z%imhOtwn`ln*
zXj&FJnO*XNzV|gKne_zCvt``$Vd#~KF#Bo3?J1mb@}pU!okzYqh+VL%9o0ejhpi|e
zyv2KBrRS;q0dY=6ZI0+z{dP|Zf}0;v!gozNmYqeX682totwa#7%S*m|gQ+7q<JKm<
zEKqlH$^>Q6%z&iP3T&pfQj<HeCB({!=R4xh599L-=VXihFF(+ySj)xBJs{$rBQrXo
z{4%*>&fj(VFs6dYhSRR_P>>*M@$;i&!W4?HWHxxhj3;CzNxp+sB?lagG#F}5H}FH;
zmY-{;SAJL;Nru|%IjU*8xZ!6||6;S&#nNg-cBXZyuW<PNbfc;TI0IU@aTcZ`Z=1lP
zIE1(C<=KGM-zwZq7>xV+Q1P^024u7fRXLJ0I(Y;#)Pe}PopuxbwnLdx#&GR%M><d~
zQkgxhA9$Usw;z2waonV23JcbO{(i>_*^nmxwbNuwM!xeee-;K<C*9@SE+$u7Q~#he
z#}i<q65h>V8uk<5r2DT8-dGR7>jw`lMpHUY-OT&VQ@^?Rv0&GviS3aj8808L9(hDh
zihJ4l!KJ^q91@y9iuimZuVRt0^j)+YEM6x>^o;fxk2Vb=rs)v56kpQ0xM99fX3jh>
znT=^;Mjzz0oy}341l2L}rzR$2gly#<rf7j*$Jdg}(i9taxLHs2Kx)q>6!<RQu%Jz`
zm%Qee{)5C#mn$8-Q5QG8xv@DN7qjQt_nX+-3A=P6U$>eC2blSgpsbUJ@{_;O=|oKQ
zX%;qovsVVb(!U(x?c%^KR1mWBHLahJ)fes(bcpl>-qIpUJ{KV;BxDwU+Pch{tm)ZK
z<*lI<f_XS8ldpH0H#7I|@O&bL$~dW#;!?0WVEk6pTIFQieTFkbk>gi8tj%YGBN~E|
z^{y=pT@>hSGan$5pwJR#k7v};)xCYfwww5;dz$Ae3j1ZYy_}mwxBoRKLt%mVtyXG?
z@>5w_Y$vloT6D|9#OC<proTCj?I&{Hw-@}>OiU7k&XY3rmb456)N!T34%8}T&b#3;
z!U}0@65L7f#eK|7Jvh+j0ub<BA`vCf{)DoyMG&>mzetg`h2F){660bC@as!5N6z1M
z7czPysb8-zGsGR|iemq3PW&D0^Ng@oUW+64r`TWdAhGwm650H09g}V>OqL4)HGtnd
zW~+=ILB_S4g7HrW|HrRRW5Lr#pwwI{G`^=Bk?Fjf-a6H4mfJTuPNi;l+ix%vpMSx&
z9N~SfB=Vl_ZBgUELb_;Emt{H~QzTn3MX)nr{$lfIn>;Wg`;_Y-y6&|Xc(~$U`dag#
z`jv{a<zJ|b!X#YfOx^!W)r-r${<UK1w)H`?h>}OvA_{KXyEjkx!)}AF`eXwc6(a&j
zSJjlLxr=%zzJG70hzFilK=09<ESNH&KasA{B1Sso%#-rj=N|kp2p@)NBlRVCGpfI8
z{XigBJ3cE_eVxq{_qx6=VX9Gx3g?%jz2AyHEPJ2o7X=dVm^FeFae?GTY4{qF<IoDl
zLW*E1)yr1I5Ff!FZBl3@>*LJJ7PRl>WBhoy(4<vEgh1}GcGzCg{Q*j1+un!q^d1s}
zg_!YV_#2*ArA)ucUUOw4HD7p;UXYT9KtN;5ZB#pg5x+AO%RdDAF_V`Ql-&K3+k35o
zcDk--S)6-<5wpE`elzK{O@qdtGm6HR2{LQCNii3Y7``{JjvLW}&U$8=$zThYewsqM
z`4P*CATL!y#f$vrh*95kjHE_Kgz%N_0MUUx*NacLU(C2U@wiE=_b1$4X44@hv^m69
z6@U6SWa0`N=>pTN2FICSKg-TXFoHrjUJrO2M7sATrR;~dVhkB5r)Zdh$V%<pS3iNQ
ziQ?~WR3`1_6#(VaT>OSw1@>9MEqZ~G<z7oU6`41AemVC8_>BpviSa0b4KfwRa!#)s
z*>`nx@h*ulPy-N+|C$BN5_lO%+=pRz>H>ux1X6Uxnr7pHF);5-)6QP$H*8zwn8vXf
zBmZ~qR)6P^mKG{c0tA?}ZEHy5ip;ZxvbVM`sZ6Lw%Y?JY!HQQkwAGB)TiZ3lBg$J+
zPFLw{EL(?iFEBNU1~lT$p59mM=gbz#*Fkc0(j1r7Bv+ZWfobx(w5wNs{_<&N1pjR~
z_YyiWQm}=;6aT&R!{5`}<pcB1$2~zXgs)sZxI$Ri$wCIZSEeTAMRxbbj^yx9onz6f
zzLKXEpT}<CXXdO-5_O>q<KmXQ^y`Pb>3%AB<sLI*$0Re9oZ0k`YJk!Gtv`4wdfEfS
z<zfJrkU`s|<CO(ws9ml24623a4{Vq56Zf^ib}GCJ*G!UE*z{0>GrTBk=h&Y<#ZA9}
zPhd<mO#z866Z+)B&DMRDH&ENqD4Fo*#$;!HQPT=i&iwJ*=98S*w5}#+)$lJlS1>!1
z=iWG9BKXrjGKaHCVb(qE5~qUAbxbk50`fDkn1$3((XBbvZ|Cu#mTg)T@u5K6f_uCq
z;ygSs8DzJ%M?$+1b(^WCyjp-+o3HG9KhOD>4=dT?Z+@-ur9dMkWxcvcJwNs+O8!)p
zaUr8>6Z@QATwaaR?`pyzEg5>|*HlKMOC^!;$5|L3ijFiBDd-Gfcj=G5M?!AD-`v#{
z`DEp<E~g&h{<Y|&v_{ldU0MT{(-HKLiF(eaY2xQh`#*d<|9K*Q4+r90X;-g@P469~
zt8=`2_Tm*_4Y6f?*Vn`$OqeS!>7ubu0)#?2FeSZis!i70AkT(nQ6mzWGOGJ{#$-EG
zmEMiJdDmryq4lM!R^~0U<SW@jQ$G6s7i7TvvFkLMg_0~d>$<s$YhDY)Jp|<zgz(A4
zwMEvOQD9RrU^+x*3O@n+?fl6ESa!{+{d40_Nk5kkKt23t1}=;@4Z9ObKJD}_th}{`
zjQkHD<vs)IK>oT(YIV>t|4l1ez577H5F98;qXqg5!9MAxoZrmkgxe)xa*T);&N_Wx
zEl_C;Hn{NgMn*}S6LqDeO3=GxZfk2rFY%2o^c0HV0~%)2$CM+&XE|I!+=x%m-yKd9
z0g2aPMZuLR3GJK`+-JE8hY&E)%}C&PT3Ym&=8V9=$Nhr>aTd5qpEz^e(!~lp?-kNJ
zhUxsr%7;M($@y3_7{gYqshwqcXbX5ym+6&ZG%F9yLh`QCIhWW#>T!t2$oSZvG_77A
z;6Sw6AqDjj7>NFhk-|0~!ubz$8_u?~)$%;Ko+`c;Or2-fT1n!f>J4eMoi}x5XUD5}
zR7Q1eCXvmrVoe9oL+f8g3{UsPiPRX#0?t`=39#_HNrcgi)DDD^>(j`JG3NF&BK|6y
z7*Eq03j4LDbmD39w2f>hxq~;SzwbnN3r;YinUjy?U36ZhVlS@9M+f6Xu%3wm4)Z?<
zWECi~vis{tvYUVu^Fr=wdg8a~Yb|8y^?kx(bI#ujk4F*iyg2s5Mn~cP0REDhpr3C^
zPTL6&dDYjFGU9Y^zmSRPAt-XJ3F(Ys#7gLeGS#{STmcVDv<E1ym60DIn@yaRl*J?w
ziB-5dcF-X1+z|rD$iKPo(XOk;iaL#R(O8+34J1V9-X#8&3H~DZp`_=;DT0VblraT@
za8eJE=CHbplx=L2{S5`bGU;b_l<Z%q!O#5~qO1d+^Eg`}j1%$`B3?!oi`fNV$Gi?`
zF+V|{6ls>5zreq;rz=PPD7V;nLs1wH!Y4I(QeD-&zN{TUeAwMuASwhG%}U{<Nu6bI
zLVScdsffY2^Huv{h;R9^Yc1gS$@hsJX4Wspe8F3QXWL?=`%E*cRPg!Q;|DO+HSRgw
zoHr(Y>#8cB9U5@x3pYb3WHOf0v)?85qoprMb<QQjS~aDJrDrppdybbIvm7SUj5X)~
z_J7L*-6?_|^u03wt=ak0bjTH&?{%|YcM(idDNXw=Nd?!g`-5MnX5c-oFGZh_d40sz
z%+t4hE~OvAA9myqThFrRwxqlkByJq?qxIj9ZPat6vn+W>bP`?96ao7q4t_&t6#>BP
znJ`3~aPrN0N4rm$bZ>@@2}iQif<M`(_b%8?oBnfju|pd6U={SXNA68N!4wN<ij4~X
z^7=WQ$%;bDqTmDNoI+y)Ce|jzUJa2_G{F}Qn#2k=qxvX9=OO6kFxOh<-$nJ!w++<A
zPKZ@X8;z+}wRM5;yw2jOae-SdYDbdW+r-wqCt<zR=Klq1T`m(47NxvrutC-taZ~l*
zR*YF-uEiFJJ5Q5$OLsQ{0!YN&d7zaKncEI4R1ghE#l`%~T(6e{T)h;@DBN{>zdHVA
zUtNI27_yI|6H<dAGY?Oe`_|;Iz6*t&8NcJJ@xHlW_*$$J<%)QlSgPShOV;-k#IUA4
zZ_p|~Phsj#eDebai7^64aWcCh{L1r%X)Nme7~>dEr4(M?7!KW#Sx<a+=kORMf$e~8
zuTDxF<0zAN>Ga-A(k9cTnUbm65B%*iG_){@I8BX|W#><i)|^srk<Gcic>XC>gB~N#
zjIhg(@1BFtDSpeNLr{gweDWp2Z;PZP&Ejekq)6^p`j8y5(eW^_tBDOL!EFRks57;g
z;8Gvc;3BSl1!y~Z$omEbCumdg`Zd;341Ab=+5sN)9S_jIb-h0&!_D$#FlXxVt#9Fl
z74LaVx5egkAN(ZA^JJ2L>cJxA12Q_;Ub=w-C!l=8M17rVCHH#?s>$a48zlw_Q&r3^
zxV^8hEUXeML!Kme@8%n|cTx-TYyD^L#S0ev;aOk!a^&ci@{a*2uKmdTuN9=q)qePz
zZ{@z<6VVtyTR;4+1qGg5g;Z4yW}-}B-@=~WD$i1<@|XcXKe(pQOMt&W5|E!k!I2*5
ztqHnsTC6y`xRIegQ+IEKs(1F4C#y;`$#s=v?)dGO_Fki4+sk@QbBzzFnLhGtXQHQ>
zu(hcfvZCl}0>wB%;&+0Jl4=H6r5mMh#96c5(q~6})7um8qLRasuI28kM?*?WK>etv
z)H-MoZ<(EHw+H)4eTh_pT(g(l6Qa^zeCx5F_>KG=JOl7<siMMQDPb$NwbO?WW7j)9
z=+k}4#IgF1RC7GG&1kBXf3U?bD_v)0)6&Ir8^)YYsL{s(tV&h3Jf`+Ms4MF#>cRVC
zf8P*R20Q`FE&lE^%r-4$JRAXqXKM@O1`y%oAnVXNZ`?eTV!&AET{J<V&vXB?;0Xry
z84=iU?%aI{7cqKssbB)v`i&U+-QXqWe^*RX39Wcm<Mf$s5ULY#6hPS_8Dnxq@P${6
z>*DKSbl%8Wu?r^VQ(*hKVCLU6Oi$23xNU|TzT&I403_>cqBgImClSN0$N&rD_p|je
zI=Zdb<J=D$R{qYl#u&ODxAtd>@g^}i>-;&q4vM*Rc|QMF;p!5zhm;j=ej57ztjV}n
zvBnKLXQ$OB_tN>prD@v={p2~XB)kUxOU=y(-}_W2qP$wRy)#@p1G!uP)NWBxk#0;m
z7ca^SVy2U1IOc|Oklq3%uUNZ8#)0w^wlJ93lE_a?|G<0onYiRJ5@;Ry7jOLb-ZBD?
zwWOV8^qC7dh;Uy!eKFP-5;^l?S(o)VEiK!TllE-@z6Rx5DF9%oQ89?=Imw008@4zv
zkK!KzzdZ$<NMgFTxQs(obJm2~$)@gu_fi25yf}U3rTaaEy8%!evy264Bs&v%A2*Mi
z9o-dHmk2pow>g)4bVto@h<lfdjRS7oK<-@dwIDNfFs|@yp$<%zF8{W=Iv78b8~L$<
z?;NUapi-d(I}$w4`#4hlb7walJjDV3)SSH&rDFtGG54&04*#tl`0xF)>(7@%GnlHu
z;q~x>4VPXbnQ13$>7i{)B_d_KaU)dz89tj6-a%PgLkcxyM6gS6Ja*Vu%{;!IvAV2z
zbGZ0EgsqV_)yJH$ng?W+fn57eLH~5ZV~n)=&j){78c~p!J!St{ddY(jMU~t}c!EMJ
z^#aHfQt*+H6&ib@)f9Bln3|!!qzf;Dl;)^>b1e2L63lX8S8CR<>r;;w;HLZXLPQoO
z|8#haPEH#P)N;b_=HY+b2bAd8w0xL|Zl{(4^Vd`ka7!I|eN(!hpU<7TyC3CukmbDv
zi|9ccHZzxZsPUmSFOc=pd7^}{OaH>NaaS&;<)8qMKTS>n0hw%DBZ7oagV3z<#6Mar
zBN<BRj8CtBE@#}-kf4Z&EYwV4rHoay&l^;V|6{3>y%=`u`Beb=b4`@+<f#=XZZ0<>
zHgiiS5Wnqq(rFG#!RsB+jERVKT_0T6oJmsq?7SWENYBtsI@9+eqtS!W)BfUwU%dd$
zC=q56I%J;};cCJerTkim?|xV+Km1p!c7%TGh-M2UYLVbKq=UWdNuk$R`Fnn~c-29w
zVz);?bD=R$P4kLccIFw$$KpsWHvHab2<yAZ5_c^dzx?8sIIdpB-Av%OAAZ{$H2(p-
zIGX(Qd0~c6tRr9X8z;%7V2hm*)g8mcJ#n;f1(B<Dw7vJ~3#5ng<C9Kn5EkErQ;C%(
zut*|5wwkwRbXpNyF;Z)HM@aWL_6S2o)*g^;BXx*cSm7Nygi$Nb#)FO@jv)~OHf^i*
ze=T|vj<4C>dd6N<cQl7xQmR&jU#FNrIFg<3-B?n(3+Te@7!hMHIU~ajmbxP*FQgo|
z8!_AqSKq#e)C3U~eEjB>24Si8*t+=_ptXsa-#&Rj%fIKxBNzJ}QgqbqUUK3=^y7t(
z8BdjrVqNL5Z6>E~$6xRclX}Ld?cpa1wSZAJN`R88pOU*FzJJj~4a=TClFWD4rUuM+
z;7!O^s!Pd7eVe_B!M4sK)(i-p(-{U_G%AiE*0oL1e@XiSpLnbdXS~Rb%qrT|_;dH{
zh0&>Z0RF+_n~t}A-G4!E%|RmHlfCc75adlIxpK$;ZFzLJ8d#}2F6aM$662G#hMWXn
z+}M-AY{V?Lt~~So30?X(7~+~2s}?w?w+f=zhWi~Y5Sfr5I*l#d()pE6zpuR;dnWj|
zd*`>mWp3Yoj?q`&d8-I#mOYqzJ0j@V@tupY^p@=;2l1AThBxklU{Z@OOZ#@b0X!uR
z5A!j5QYh!rANx~P%DyN5QuPdbJh`<W#F+JsyEFr$lK55qPX-dBfBw1tvQM52YG_f~
zJpRh<o3=v*(bDd%^r_dw4)P(~;XiVk6AJN>Q1U@_A^tMe7-i=4i+v)v^(eGe3u+OP
zH>MK1PCZoGs8igaE4eg7DFXZ3u9pp{(++o3Y;Lf^?Jf!H`GFPnf?Ztd_ZLHlm)#=I
zoqQTGzM%^e`P0m9&Sce4kiR@Sb@tzyz4tHuB}ieN#$O_1vfaKZlyp~&|MmE8q;~qw
zWs$+m7|cVKoJsQUxMng9mDH+v*2y%*NFYSufayikj|;z^QBCm@`O%OCt8QI+AvYt?
z3SX%;CAK<l^yErB16hA~vs?&N9`F_yE{8r#{X7;{K{RKgI(w8|<koXi2gu(5`gBsI
zM4qlw2RK<!4Eyk4S~nnYAhc}zFOaeXHb>X&vKPNzAGTN$LPxI6>k`Vna_-!@s7LO+
zP-jF>rUx{QLiF~j^%g4?9qveqhjfFLchqf=cM{DfJdSGa62hp5b7AQ}0Efr^nN~w3
zBG}yuscQK^kmX@X+c=F&F$$LqmmEDebt*$T7=swU2OQUj)ce)?S`;c{b<G@#<-sxZ
zip}<*w@vA`OTPx=yhKW+9>xCs6P+{~vOUSr6bCV{iQS1F&OnA6yj15zcaA@On@XA`
zPx@R@g*v)QQupG<rU=P>IrqpbOrWF!;v!0FHUnD>zXjf$MfZ61`xa57_(+`@rvm#R
zHr}{*>;KQ;q9H47aLVzM@S(MhX6^ttd~kr`RL@>zp-hj=<gvML?hec9FqP0HfiZ7U
z75?()^GUV0N0f|N9U1ZA57mtsoWmkj)~h;HJP2{EJSouq2Wq4Y`b*{ah(7s2UR!{z
zh<+KQqEP<EA-4IOX$NHyODgf|fnYRY6Df~=Yl9HZ_3XhycP`0{POj-!waWey{_LG3
zASm;w1x3$aDW^3hT-I5$Kc&wk()m5!3B@K@sxQpnQZ(@(Dd?lh+*^ge%5KHU1aK-6
zRGZjOH-%9;UBTSgw6(Ir7shdGl}z)q4=nYgXJphx9n?i-`-x-+%MGMRV+u)lnwmG?
z3V>++Mij-ZV&DGqe-0&_;as%bs~3A0*HJ^TPXZ;UlX_2NSqm<vs)%QK{xPL6IR){u
zGWHduv;YzYx>H8<gHFS-|JnCoB_u4F4)F}JZ%!bhbK1Lj5q?bV`ij_DmX$dCw^%Jl
z#KhhkxO%KOsb&#y^N<EXMMv}MqQyj=ku~GfVZ;)s<Sfii|EBk?i$<|h-sn^@X;q0&
za*1(*^Ur0Vs4vz84F5<1^`bM=fYfSy|Kl1SB39t2QRUEIq70@XRG_AD^}cSSQeP<x
z<!UAIeo69sj4c>a%Bs~-16rvqU4mhBt|j<@B7xW!Y<lF6nTgt{aVx;hGCe}VPk9o#
zvXkO7<Sb}-lfer-K>e{KP|`V8p^Kw3+X{|B@FF;JVT;+1k_RVU|3gv&!^e0)7hnw@
z_W6FbdzjTSlXj#dMumH10DPK3q&--%WRc1&Qb=bE{=|ysGz0`(`^X6vH4Qo#8G<2M
znz>L>9%%4K69LF8SO6*%Qfj>8k$=9XpWtkvg^EQQlA`k1rrb7{?8(ODoH?+ZAlDB>
zKWJhlnhJ_Z@)#AL7qM*ptNH!)&!LsJK}k%}{F&!J4<)P!MELrSZ}tgFM_wgyfP$LY
z%-r@vm04Zy30E)0Vn|Rj4oLR<v3AJ-=Rcb)&8Lrq%($oiXMZb+#1cGLsSo?NtBDp<
zv<NQ)onQwhK;O_coR5(>N*9==i6xa8R%U4lAyWeTjlV6z48;EF|AWB%E7aD4{ps?N
z$s*|c7o`x-A}V!eLch{b$dq<1qH{1*lK};Ck_1_D(9SoK{Q&N}#hF*p8@*{KBf3e&
zwhykP<8w6xLBp}Dddlm`x99JAsCSftH@6FV)S23LRiavb|JBzsdJwrTExSVJjK1H-
z6H_x?&nO`G{!3OZa}vymE4sM~nCBUbd`V1Oi<lc!@9e(X$ctlNQ11Ion{m@)PvZOv
zvP!&56SReft&SY(k=zv7TpHmul=#sFUPbCh3I*J2kAve?%_gb+#^vXZ)}&saf9W^1
z1f=D$<Jd`ybuZ;Ep;)hv+mt7YL%ZEHxV2L6lUqU-AXg%i&D@K+`rp3=KwsNL>*Iar
Gxc>vgVX<-m

diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 505815f4b2e..9d15cb37a2b 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -34,7 +34,7 @@ openerp.google_docs = function (instance, m) {
                                     self.items.other.splice(g_item, 1);
                                 }
                                 self.add_items('other', [{
-                                        label: res.name+ '<img style="height:20px;width:20px;float:right;" src="google_docs/static/src/img/drive_icon.png"/>',
+                                        label: res.name+ '<img style="position:absolute;right:5px;height:20px;width:20px;" title="Google Drive" src="google_docs/static/src/img/drive_icon.png"/>',
                                         config_id: res.id,
                                         res_id: res_id,
                                         res_model: view.dataset.model,

From d68d2e44eb30b70266e6f11656e7bf4705b3824d Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Wed, 29 May 2013 13:16:29 +0530
Subject: [PATCH 48/61] [IMP] Improved Code

bzr revid: pga@tinyerp.com-20130529074629-4x7dooxgbq5g6hdc
---
 addons/google_docs/google_docs.py           | 4 +---
 addons/google_docs/res_config_user_view.xml | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index e97f0d929f1..98ca35e20cc 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -97,10 +97,8 @@ class config(osv.osv):
                 attach_vals = {'res_model': res_model, 'name': name_gdocs, 'res_id': res_id, 'type': 'url', 'url':content['alternateLink']}
                 attach_pool.create(cr, uid, attach_vals)
                 res = content['alternateLink']
-        elif uid==1:
-            raise self.pool.get('res.config.settings').get_config_warning(cr, _("You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %%(menu:base_setup.menu_general_configuration)s."), context=context)
         else:
-            raise osv.except_osv(_('Google Drive Configuration Error!'), _("'Authorization Code' is not configured yet, Please Contact Administrator"))
+            raise self.pool.get('res.config.settings').get_config_warning(cr, _("You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %%(menu:base_setup.menu_general_configuration)s."), context=context)
         return res
     
     def get_google_docs_config(self, cr, uid, res_model, res_id, context=None):
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 50cb1851d07..06a729125ab 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -76,6 +76,7 @@
                 <xpath expr="//div[@name='google_docs']" position="after">
                     <div attrs="{'invisible': [('module_google_docs','=',False)]}">
                         <p class="oe_gray" >
+                            <!-- Need to generate client id, redirect url from Google Account (API console) and replace below link. Limitation on Number of request: 10 lacks per day. -->
                             Click here to <a href="https://accounts.google.com/o/oauth2/auth?scope=https://www.googleapis.com/auth/drive&amp;redirect_uri=urn:ietf:wg:oauth:2.0:oob&amp;response_type=code&amp;client_id=39623646228-eg3ggo3mk6o40m7rguobi3rkl9frh4tb.apps.googleusercontent.com" target="_blank"><b>Generate Google Authorization Code</b></a><br/>
                             <group>
                                 <field  name="authorization_code" on_change="onchange_authorization_code(authorization_code)"/>

From 0784c33c381fd7c718c1209b9759e2611fc40af3 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Thu, 30 May 2013 15:16:19 +0530
Subject: [PATCH 49/61] [ADD] Managing Folders in Google Drive

bzr revid: pga@tinyerp.com-20130530094619-nvhpyvid4sqzur9l
---
 addons/google_docs/google_docs.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 98ca35e20cc..93274ba6d24 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -85,9 +85,13 @@ class config(osv.osv):
         
         # Copy template in to drive with help of new access token
         if content.has_key('access_token'):
+            request_url = "https://www.googleapis.com/drive/v2/files/%s?fields=parents/id&access_token=%s" % (tamplate_id, content['access_token'])
+            resp, parents = Http().request(request_url, "GET")
+            parents_dict = json.loads(parents)
+
             headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
             record_url = "Click on link to open Record in OpenERP\n %s/?db=%s#id=%s&model=%s" %(google_web_base_url, cr.dbname, res_id, res_model ) 
-            data = {"title": name_gdocs, "description": record_url}
+            data = {"title": name_gdocs, "description": record_url, "parents":parents_dict['parents']}
             request_url = "https://www.googleapis.com/drive/v2/files/%s/copy?access_token=%s" % (tamplate_id, content['access_token'])
             resp, content = Http().request(request_url, "POST", json.dumps(data), headers)
             content = json.loads(content)

From ed3509568d0212a976344a626892bc56b666fd57 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 4 Jun 2013 11:59:48 +0530
Subject: [PATCH 50/61] [IMP] improve configuration warning and disription of
 the module

bzr revid: tpa@tinyerp.com-20130604062948-vi0j5pzi5s2agjp9
---
 addons/google_docs/__openerp__.py | 9 ++++-----
 addons/google_docs/google_docs.py | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 6b7f28116ec..2536edb823b 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -41,11 +41,10 @@
     ],
     'depends': ['base_setup'],
     'description': """
-Integrate Google document with OpenERP.
-=======================================
+Integrate google document to OpenERP record.
+============================================
 
-This module is used to integrate google document to OpenERP record.
-
-You can configure google accounts from Settings > Users > Users.
+This module allows you to integrate google documents to any of your OpenERP record quickly and easily using OAuth 2.0 for Installed Applications, 
+You can configure your google Authorization Code from Settings > Configuration > General Settings by clicking on "Generate Google Authorization Code"
 """
 }
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 93274ba6d24..63a3a423a34 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -102,7 +102,7 @@ class config(osv.osv):
                 attach_pool.create(cr, uid, attach_vals)
                 res = content['alternateLink']
         else:
-            raise self.pool.get('res.config.settings').get_config_warning(cr, _("You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %%(menu:base_setup.menu_general_configuration)s."), context=context)
+            raise self.pool.get('res.config.settings').get_config_warning(cr, _("You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %(menu:base_setup.menu_general_configuration)s."), context=context)
         return res
     
     def get_google_docs_config(self, cr, uid, res_model, res_id, context=None):

From fcd929f3a2f42aa208f7abe4bc6258234d2afd2c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 21 Jun 2013 16:58:45 +0200
Subject: [PATCH 51/61] [FIX]google_docs: supplier template => customer
 template

bzr revid: dle@openerp.com-20130621145845-4626l1j33heaqs1y
---
 addons/google_docs/google_docs_demo.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/google_docs/google_docs_demo.xml b/addons/google_docs/google_docs_demo.xml
index df2daee6ccd..8dcafe0ea45 100644
--- a/addons/google_docs/google_docs_demo.xml
+++ b/addons/google_docs/google_docs_demo.xml
@@ -4,16 +4,15 @@
 
         <!-- filter demo -->
         <record id="filter_partner" model="ir.filters">
-            <field name="name">Supplier</field>
+            <field name="name">Customer</field>
             <field name="model_id">res.partner</field>
-            <field name="domain">[['supplier', '=', 1]]</field>
-            <field name="context">{'lang': 'en_US', 'tz': 'Europe/Brussels'}</field>
+            <field name="domain">[['customer', '=', 1]]</field>
             <field name="user_id" eval="False" />
         </record>
 
         <!-- template demo -->
         <record id="template_partner" model="google.docs.config">
-            <field name="name">Supplier Docs</field>
+            <field name="name">Customer Doc</field>
             <field name="model_id">res.partner</field>
             <field name="filter_id" ref="filter_partner"/>
             <field name="gdocs_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>

From d40bc9b776b9b25d73f0340c01c6220dcf740fdd Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 24 Jun 2013 15:39:50 +0200
Subject: [PATCH 52/61] [FIX]google_base_account: typo. (stoi le gogole
 *priceless*)

bzr revid: dle@openerp.com-20130624133950-jcxv0nbn0ke6xzj0
---
 addons/google_base_account/google_base_account_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/google_base_account/google_base_account_view.xml b/addons/google_base_account/google_base_account_view.xml
index d46a7cb9b27..e86d556eb9e 100644
--- a/addons/google_base_account/google_base_account_view.xml
+++ b/addons/google_base_account/google_base_account_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <record id="view_users_gogole_form" model="ir.ui.view">
+        <record id="view_users_google_form" model="ir.ui.view">
             <field name="name">res.users.google.form1</field>
             <field name="model">res.users</field>
             <field name="inherit_id" ref="base.view_users_form"/>
@@ -16,7 +16,7 @@
                 </xpath>
             </field>
         </record>
-        <record id="view_users_gogole_preference" model="ir.ui.view">
+        <record id="view_users_google_preference" model="ir.ui.view">
             <field name="name">res.users.google.form2</field>
             <field name="model">res.users</field>
             <field name="inherit_id" ref="base.view_users_form_simple_modif"/>

From 0bca00c42c87c093e7ff54d7542c0f7fd083253c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 25 Jun 2013 12:58:19 +0200
Subject: [PATCH 53/61] [FIX]google_docs: generic function moved in base
 account

bzr revid: dle@openerp.com-20130625105819-l8d2zu0vf4tzne2t
---
 addons/google_base_account/__openerp__.py     |  2 +-
 .../google_base_account.py                    | 42 ++++++++++++++--
 addons/google_docs/__openerp__.py             |  2 +-
 addons/google_docs/google_docs.py             | 48 +++++--------------
 addons/google_docs/google_docs_data.xml       | 21 ++++----
 addons/google_docs/res_config_user_view.xml   |  2 +-
 addons/google_docs/static/src/js/gdocs.js     |  2 +-
 7 files changed, 62 insertions(+), 57 deletions(-)

diff --git a/addons/google_base_account/__openerp__.py b/addons/google_base_account/__openerp__.py
index b4d996f2807..ece50a6f984 100644
--- a/addons/google_base_account/__openerp__.py
+++ b/addons/google_base_account/__openerp__.py
@@ -30,7 +30,7 @@ The module adds google user in res user.
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base'],
+    'depends': ['base_setup'],
     'data': [
         'google_base_account_view.xml',
         'wizard/google_login_view.xml',
diff --git a/addons/google_base_account/google_base_account.py b/addons/google_base_account/google_base_account.py
index 06e5643344c..0bcbf4f4785 100644
--- a/addons/google_base_account/google_base_account.py
+++ b/addons/google_base_account/google_base_account.py
@@ -19,8 +19,14 @@
 #
 ##############################################################################
 
-from openerp.osv import fields,osv
-    
+from openerp.osv import fields, osv
+from openerp import SUPERUSER_ID
+
+from httplib2 import Http
+import urllib
+import simplejson
+
+
 class res_users(osv.osv):
     _inherit = "res.users"
     _columns = {
@@ -28,5 +34,35 @@ class res_users(osv.osv):
         'gmail_password': fields.char('Password', size=64),
     }
 
-# vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:
 
+class base_config_settings(osv.osv):
+    _inherit = "base.config.settings"
+
+    def onchange_google_authorization_code(self, cr, uid, ids, service, authorization_code, context=None):
+        res = {}
+        if authorization_code:
+            ir_config = self.pool['ir.config_parameter']
+            client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_%s_client_id' % service)
+            client_secret = ir_config.get_param(cr, SUPERUSER_ID, 'google_%s_client_secret' % service)
+            redirect_uri = ir_config.get_param(cr, SUPERUSER_ID, 'google_redirect_uri')
+
+            #Get the Refresh Token From Google And store it in ir.config_parameter
+            headers = {"Content-type": "application/x-www-form-urlencoded"}
+            data = dict(code=authorization_code, client_id=client_id, client_secret=client_secret, redirect_uri=redirect_uri, grant_type="authorization_code")
+            data = urllib.urlencode(data)
+            resp, content = Http().request("https://accounts.google.com/o/oauth2/token", "POST", data, headers)
+            content = simplejson.loads(content)
+            if 'refresh_token' in content.keys():
+                ir_config.set_param(cr, uid, 'google_%s_refresh_token' % service, content['refresh_token'])
+        return res
+
+    # def get_default_google_authorization_code(self, cr, uid, ids, service, context=None):
+    #     authorization_code = self.pool.get("ir.config_parameter").get_param(cr, uid, "google_%s_authorization_code" % service, context=context)
+    #     return {'authorization_code': authorization_code}
+
+    # def set_google_authorization_code(self, cr, uid, ids, service, context=None):
+    #     config_parameters = self.pool.get("ir.config_parameter")
+    #     for record in self.read(cr, uid, ids, ['google_%s_authorization_code' % service], context=context):
+    #         config_parameters.set_param(cr, uid, "google_%s_authorization_code" % service, record['google_%s_authorization_code' % service] or '', context=context)
+
+# vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 2536edb823b..8e4b2fa612e 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -39,7 +39,7 @@
     'demo': [
         'google_docs_demo.xml'
     ],
-    'depends': ['base_setup'],
+    'depends': ['base_setup', 'google_base_account'],
     'description': """
 Integrate google document to OpenERP record.
 ============================================
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 63a3a423a34..d6cfb3dfe4a 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -68,16 +68,16 @@ class config(osv.osv):
     
     def copy_doc(self, cr, uid, ids, res_id, tamplate_id, name_gdocs, res_model, context=None):
         ir_config = self.pool[ 'ir.config_parameter' ]
-        google_client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_client_id')
-        google_client_secret = ir_config.get_param(cr, SUPERUSER_ID, 'google_client_secret')
-        google_refresh_token = ir_config.get_param(cr, SUPERUSER_ID, 'google_refresh_token')
+        google_docs_client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_docs_client_id')
+        google_docs_client_secret = ir_config.get_param(cr, SUPERUSER_ID, 'google_docs_client_secret')
+        google_docs_refresh_token = ir_config.get_param(cr, SUPERUSER_ID, 'google_docs_refresh_token')
         google_web_base_url = ir_config.get_param(cr, SUPERUSER_ID, 'web.base.url')
         
         #For Getting New Access Token With help of old Refresh Token 
         headers = {"Content-type": "application/x-www-form-urlencoded"}
-        data = dict(client_id = google_client_id, 
-                    refresh_token = google_refresh_token, 
-                    client_secret = google_client_secret, 
+        data = dict(client_id = google_docs_client_id, 
+                    refresh_token = google_docs_refresh_token, 
+                    client_secret = google_docs_client_secret, 
                     grant_type = "refresh_token")
         data = urllib.urlencode(data) 
         resp, content = Http().request("https://accounts.google.com/o/oauth2/token", "POST", data, headers)
@@ -172,7 +172,7 @@ class config(osv.osv):
         result = {}
         for config_id in ids:
             config = self.pool['ir.config_parameter']
-            result[config_id] = config.get_param(cr, SUPERUSER_ID, 'google_client_id')
+            result[config_id] = config.get_param(cr, SUPERUSER_ID, 'google_docs_client_id')
         return result
 
     _columns = {
@@ -181,7 +181,7 @@ class config(osv.osv):
         'filter_id' : fields.many2one('ir.filters', 'Filter'),
         'gdocs_template_url': fields.char('Template URL', required=True, size=1024),
         'gdocs_resource_id' : fields.function(_resource_get, type="char" , string='Resource Id'),
-        'google_client_id' : fields.function(_client_id_get, type="char" , string='Google Client '),
+        'google_docs_client_id' : fields.function(_client_id_get, type="char" , string='Google Client '),
         '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),
     }
 
@@ -209,36 +209,10 @@ class config(osv.osv):
 
 config()
 
+
 class base_config_settings(osv.osv):
     _inherit = "base.config.settings"
-    
-    def onchange_authorization_code(self, cr, uid, ids, authorization_code, context=None):
-        res = {}
-        if authorization_code:
-            ir_config = self.pool['ir.config_parameter']
-            google_client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_client_id')
-            google_client_secret = ir_config.get_param(cr, SUPERUSER_ID, 'google_client_secret')
-            google_redirect_uri = ir_config.get_param(cr, SUPERUSER_ID, 'google_redirect_uri')
-            
-            #Get the Refresh Token From Google And store it in ir.config_parameter 
-            headers = {"Content-type": "application/x-www-form-urlencoded"}
-            data = dict(code=authorization_code, client_id=google_client_id, client_secret=google_client_secret,redirect_uri=google_redirect_uri,grant_type="authorization_code")
-            data = urllib.urlencode(data) 
-            resp, content = Http().request("https://accounts.google.com/o/oauth2/token", "POST", data,headers)
-            content=json.loads(content)
-            if 'refresh_token' in content.keys():
-                ir_config.set_param(cr, uid, 'google_refresh_token', content['refresh_token'])
-        return res
-    
-    def get_default_authorization_code(self, cr, uid, ids, context=None):
-        authorization_code = self.pool.get("ir.config_parameter").get_param(cr, uid, "authorization_code", context=context)
-        return {'authorization_code': authorization_code}
 
-    def set_authorization_code(self, cr, uid, ids, context=None):
-        config_parameters = self.pool.get("ir.config_parameter")
-        for record in self.browse(cr, uid, ids, context=context):
-            config_parameters.set_param(cr, uid, "authorization_code", record.authorization_code or '', context=context)
-    
     _columns = {
-        'authorization_code': fields.char('Paste Generated "Authorization Code" from google to here', size=124),
-    }
\ No newline at end of file
+        'google_docs_authorization_code': fields.char('Paste Generated "Authorization Code" from google to here', size=124),
+    }
diff --git a/addons/google_docs/google_docs_data.xml b/addons/google_docs/google_docs_data.xml
index 5ec29c12a7c..f674f0a8a31 100644
--- a/addons/google_docs/google_docs_data.xml
+++ b/addons/google_docs/google_docs_data.xml
@@ -2,28 +2,23 @@
 <openerp>
     <data noupdate="1">
   
-         <record id="config_google_client_id" model="ir.config_parameter">
-            <field name="key">google_client_id</field>
+         <record id="config_google_docs_client_id" model="ir.config_parameter">
+            <field name="key">google_docs_client_id</field>
             <field name="value">39623646228-eg3ggo3mk6o40m7rguobi3rkl9frh4tb.apps.googleusercontent.com</field>
         </record>
         
-        <record id="config_google_client_secret" model="ir.config_parameter">
-            <field name="key">google_client_secret</field>
+        <record id="config_google_docs_client_secret" model="ir.config_parameter">
+            <field name="key">google_docs_client_secret</field>
             <field name="value">Ul-PtmnSWs3euWs20fdono0e</field>
         </record>
 
-        <record id="config_google_redirect_uri" model="ir.config_parameter">
-            <field name="key">google_redirect_uri</field>
-            <field name="value">urn:ietf:wg:oauth:2.0:oob</field>
-        </record>
-
-        <record id="config_refresh_token" model="ir.config_parameter">
-            <field name="key">google_refresh_token</field>
+        <record id="config_google_docs_refresh_token" model="ir.config_parameter">
+            <field name="key">google_docs_refresh_token</field>
             <field name="value">-</field>
         </record>
 
-        <record id="config_authorization_code" model="ir.config_parameter">
-            <field name="key">authorization_code</field>
+        <record id="config_google_docs_authorization_code" model="ir.config_parameter">
+            <field name="key">google_docs_authorization_code</field>
             <field name="value">-</field>
         </record>
     </data>
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 06a729125ab..50560be4a11 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -79,7 +79,7 @@
                             <!-- Need to generate client id, redirect url from Google Account (API console) and replace below link. Limitation on Number of request: 10 lacks per day. -->
                             Click here to <a href="https://accounts.google.com/o/oauth2/auth?scope=https://www.googleapis.com/auth/drive&amp;redirect_uri=urn:ietf:wg:oauth:2.0:oob&amp;response_type=code&amp;client_id=39623646228-eg3ggo3mk6o40m7rguobi3rkl9frh4tb.apps.googleusercontent.com" target="_blank"><b>Generate Google Authorization Code</b></a><br/>
                             <group>
-                                <field  name="authorization_code" on_change="onchange_authorization_code(authorization_code)"/>
+                                <field  name="google_docs_authorization_code" on_change="onchange_google_authorization_code('docs', google_docs_authorization_code)"/>''
                             </group>
                             Configure your templates and link your google document to OpenERP records <button type="action" name="%(google_docs.action_google_docs_users_config)d" string="Configure Template" class="oe_link" />
                         </p>
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 9d15cb37a2b..24385b3b85e 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -56,7 +56,7 @@ openerp.google_docs = function (instance, m) {
         on_google_doc: function (doc_item) {
             var self = this;
             self.config = doc_item;
-            var loaded = self.fetch('google.docs.config', ['gdocs_resource_id', 'google_client_id'], [['id', '=', doc_item.config_id]])
+            var loaded = self.fetch('google.docs.config', ['gdocs_resource_id', 'google_docs_client_id'], [['id', '=', doc_item.config_id]])
                 .then(function (configs) {
                 var ds = new instance.web.DataSet(self, 'google.docs.config');
                 ds.call('get_google_doc_name', [[doc_item.config_id], doc_item.res_id,configs[0].gdocs_resource_id]).done(function (r) {

From 3afc97f451d8550f18b7b54a08456f7d242888e8 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 25 Jun 2013 18:19:22 +0200
Subject: [PATCH 54/61] [FIX&DEL]google_*: remove of now useless views and code
 from google_base_account, and move generic function from google_docs to
 google_base_account

bzr revid: dle@openerp.com-20130625161922-3u1m5qeqcj84rmq5
---
 addons/google_base_account/__init__.py        |  1 -
 addons/google_base_account/__openerp__.py     |  3 +-
 .../google_base_account.py                    | 29 +++----
 .../google_base_account_data.xml              |  9 ++
 .../google_base_account_view.xml              | 33 -------
 addons/google_base_account/wizard/__init__.py | 25 ------
 .../wizard/google_login.py                    | 85 -------------------
 .../wizard/google_login_view.xml              | 35 --------
 addons/google_docs/google_docs.py             |  4 +
 addons/google_docs/res_config_user_view.xml   |  5 +-
 10 files changed, 29 insertions(+), 200 deletions(-)
 create mode 100644 addons/google_base_account/google_base_account_data.xml
 delete mode 100644 addons/google_base_account/google_base_account_view.xml
 delete mode 100644 addons/google_base_account/wizard/__init__.py
 delete mode 100644 addons/google_base_account/wizard/google_login.py
 delete mode 100644 addons/google_base_account/wizard/google_login_view.xml

diff --git a/addons/google_base_account/__init__.py b/addons/google_base_account/__init__.py
index e1a476431af..44a5aabe277 100644
--- a/addons/google_base_account/__init__.py
+++ b/addons/google_base_account/__init__.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import google_base_account
-import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/google_base_account/__openerp__.py b/addons/google_base_account/__openerp__.py
index ece50a6f984..99678d2785d 100644
--- a/addons/google_base_account/__openerp__.py
+++ b/addons/google_base_account/__openerp__.py
@@ -32,8 +32,7 @@ The module adds google user in res user.
     'website': 'http://www.openerp.com',
     'depends': ['base_setup'],
     'data': [
-        'google_base_account_view.xml',
-        'wizard/google_login_view.xml',
+        'google_base_account_data.xml',
     ],
     'demo': [],
     'installable': True,
diff --git a/addons/google_base_account/google_base_account.py b/addons/google_base_account/google_base_account.py
index 0bcbf4f4785..39ccc569767 100644
--- a/addons/google_base_account/google_base_account.py
+++ b/addons/google_base_account/google_base_account.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import osv
 from openerp import SUPERUSER_ID
 
 from httplib2 import Http
@@ -27,14 +27,6 @@ import urllib
 import simplejson
 
 
-class res_users(osv.osv):
-    _inherit = "res.users"
-    _columns = {
-        'gmail_user': fields.char('Username', size=64,),
-        'gmail_password': fields.char('Password', size=64),
-    }
-
-
 class base_config_settings(osv.osv):
     _inherit = "base.config.settings"
 
@@ -56,13 +48,16 @@ class base_config_settings(osv.osv):
                 ir_config.set_param(cr, uid, 'google_%s_refresh_token' % service, content['refresh_token'])
         return res
 
-    # def get_default_google_authorization_code(self, cr, uid, ids, service, context=None):
-    #     authorization_code = self.pool.get("ir.config_parameter").get_param(cr, uid, "google_%s_authorization_code" % service, context=context)
-    #     return {'authorization_code': authorization_code}
-
-    # def set_google_authorization_code(self, cr, uid, ids, service, context=None):
-    #     config_parameters = self.pool.get("ir.config_parameter")
-    #     for record in self.read(cr, uid, ids, ['google_%s_authorization_code' % service], context=context):
-    #         config_parameters.set_param(cr, uid, "google_%s_authorization_code" % service, record['google_%s_authorization_code' % service] or '', context=context)
+    def _get_google_token_uri(self, cr, uid, service, context=None):
+        ir_config = self.pool['ir.config_parameter']
+        params = {
+            'scope': 'https://www.googleapis.com/auth/drive',
+            'redirect_uri': ir_config.get_param(cr, SUPERUSER_ID, 'google_redirect_uri'),
+            'client_id': ir_config.get_param(cr, SUPERUSER_ID, 'google_%s_client_id' % service),
+            'response_type': 'code',
+            'client_id': ir_config.get_param(cr, SUPERUSER_ID, 'google_%s_client_id' % service),
+        }
+        uri = 'https://accounts.google.com/o/oauth2/auth?%s' % urllib.urlencode(params)
+        return uri
 
 # vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/google_base_account/google_base_account_data.xml b/addons/google_base_account/google_base_account_data.xml
new file mode 100644
index 00000000000..c6748df7dc9
--- /dev/null
+++ b/addons/google_base_account/google_base_account_data.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+    	<record id="config_google_redirect_uri" model="ir.config_parameter">
+            <field name="key">google_redirect_uri</field>
+            <field name="value">urn:ietf:wg:oauth:2.0:oob</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/google_base_account/google_base_account_view.xml b/addons/google_base_account/google_base_account_view.xml
deleted file mode 100644
index e86d556eb9e..00000000000
--- a/addons/google_base_account/google_base_account_view.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record id="view_users_google_form" model="ir.ui.view">
-            <field name="name">res.users.google.form1</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//notebook" position="inside">
-                    <page string="Google Account">
-                        <group string="Google Account" colspan="4">
-                            <field name="gmail_user"/>
-                            <field name="gmail_password" password="True"/>
-                        </group>
-                    </page>
-                </xpath>
-            </field>
-        </record>
-        <record id="view_users_google_preference" model="ir.ui.view">
-            <field name="name">res.users.google.form2</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='preferences']" position="after">
-                        <group string="Google Account" colspan="4">
-                            <field name="gmail_user" readonly="0"/>
-                            <field name="gmail_password" password="True" readonly="0"/>
-                        </group>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/google_base_account/wizard/__init__.py b/addons/google_base_account/wizard/__init__.py
deleted file mode 100644
index a6b9c644a1e..00000000000
--- a/addons/google_base_account/wizard/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import google_login
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/google_base_account/wizard/google_login.py b/addons/google_base_account/wizard/google_login.py
deleted file mode 100644
index 1771d99b51e..00000000000
--- a/addons/google_base_account/wizard/google_login.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import fields,osv
-from openerp.tools.translate import _
-try:
-    import gdata.contacts.service
-    import gdata.contacts.client
-    import gdata.calendar.service
-except ImportError:
-    raise osv.except_osv(_('Google Contacts Import Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list'))
-
-class google_login(osv.osv_memory):
-    _description ='Google Contact'
-    _name = 'google.login'
-    _columns = {
-        'user': fields.char('Google Username', size=64, required=True),
-        'password': fields.char('Google Password', size=64),
-    }
-
-    def google_login(self, user, password, type='', context=None):
-        if type == 'group':
-            gd_client = gdata.contacts.service.ContactsService()
-        elif type == 'contact':
-            gd_client = gdata.contacts.service.ContactsService()
-        elif type == 'calendar':
-            gd_client = gdata.calendar.service.CalendarService()
-        elif type =='docs_client':
-            gd_client = gdata.docs.client.DocsClient()
-        else:
-            gd_client = gdata.contacts.service.ContactsService()
-        try:
-            gd_client.ClientLogin(user, password, gd_client.source)
-        except Exception:
-            return False
-        return gd_client
-
-
-    def default_get(self, cr, uid, fields, context=None):
-        res = super(google_login, self).default_get(cr, uid, fields, context=context)
-        user_obj = self.pool.get('res.users').browse(cr, uid, uid)
-        if 'user' in fields:
-            res.update({'user': user_obj.gmail_user})
-        if 'password' in fields:
-            res.update({'password': user_obj.gmail_password})
-        return res
-
-    def login(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids)[0]
-        user = data['user']
-        password = data['password']
-        if self.google_login(user, password):
-            res = {
-                   'gmail_user': user,
-                   'gmail_password': password
-            }
-            self.pool.get('res.users').write(cr, uid, uid, res, context=context)
-        else:
-            raise osv.except_osv(_('Error!'), _("Authentication failed. Check the user and password."))
-
-        return self._get_next_action(cr, uid, context=context)
-
-    def _get_next_action(self, cr, uid, context=None):
-        return {'type': 'ir.actions.act_window_close'}
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/google_base_account/wizard/google_login_view.xml b/addons/google_base_account/wizard/google_login_view.xml
deleted file mode 100644
index ed345ab5a0f..00000000000
--- a/addons/google_base_account/wizard/google_login_view.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record model="ir.ui.view" id="view_google_login_form">
-            <field name="name">google.login.form</field>
-            <field name="model">google.login</field>
-            <field name="arch" type="xml">
-                <form string="Google login"  version="7.0">
-                    <group>
-                        <field name="user" placeholder="e.g. user@gmail.com"/>
-                        <field name="password" password="True"/>
-                    </group>
-                    <footer>
-                        <button name="login" string="_Login" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-                </form>
-            </field>
-        </record>
-        
-        <!-- 
-            Login Action 
-        -->
-        <record model="ir.actions.act_window" id="act_google_login_form">
-          <field name="name">Google Login</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">google.login</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-          <field name="view_id" ref="view_google_login_form" />
-        </record>
-    </data>
-</openerp>
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index d6cfb3dfe4a..8b0d8f53b2e 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -215,4 +215,8 @@ class base_config_settings(osv.osv):
 
     _columns = {
         'google_docs_authorization_code': fields.char('Paste Generated "Authorization Code" from google to here', size=124),
+        'google_docs_uri': fields.char('URI', readonly=True, help="The URL to generate the authorization code from Google"),
+    }
+    _defaults = {
+        'google_docs_uri': lambda s, cr, uid, c: s._get_google_token_uri(cr, uid, 'docs', context=c),
     }
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 50560be4a11..560c36cc99c 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -76,8 +76,9 @@
                 <xpath expr="//div[@name='google_docs']" position="after">
                     <div attrs="{'invisible': [('module_google_docs','=',False)]}">
                         <p class="oe_gray" >
-                            <!-- Need to generate client id, redirect url from Google Account (API console) and replace below link. Limitation on Number of request: 10 lacks per day. -->
-                            Click here to <a href="https://accounts.google.com/o/oauth2/auth?scope=https://www.googleapis.com/auth/drive&amp;redirect_uri=urn:ietf:wg:oauth:2.0:oob&amp;response_type=code&amp;client_id=39623646228-eg3ggo3mk6o40m7rguobi3rkl9frh4tb.apps.googleusercontent.com" target="_blank"><b>Generate Google Authorization Code</b></a><br/>
+                            <div class="oe_inline">
+                                Click here to <field name="google_docs_uri" widget="url" text="Generate Google Authorization Code" class="oe_inline oe_bold"/>
+                            </div>
                             <group>
                                 <field  name="google_docs_authorization_code" on_change="onchange_google_authorization_code('docs', google_docs_authorization_code)"/>''
                             </group>

From c74517990f1bec61e52e455be4ec12b6135015a6 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 26 Jun 2013 11:30:19 +0200
Subject: [PATCH 55/61] [RENAME]google_docs => google_drive

bzr revid: dle@openerp.com-20130626093019-krwt5eamagmd5amu
---
 addons/base_setup/res_config.py               |   2 +-
 addons/base_setup/res_config_view.xml         |   4 +-
 addons/google_docs/__init__.py                |   1 -
 addons/google_docs/google_docs_data.xml       |  25 ------------
 .../google_docs/security/ir.model.access.csv  |   3 --
 addons/google_drive/__init__.py               |   1 +
 .../__openerp__.py                            |   6 +--
 .../google_drive.py}                          |  34 ++++++++--------
 addons/google_drive/google_drive_data.xml     |  25 ++++++++++++
 .../google_drive_demo.xml}                    |   4 +-
 .../{google_docs => google_drive}/i18n/ar.po  |   0
 .../{google_docs => google_drive}/i18n/cs.po  |   0
 .../{google_docs => google_drive}/i18n/de.po  |   0
 .../{google_docs => google_drive}/i18n/es.po  |   0
 .../{google_docs => google_drive}/i18n/fr.po  |   0
 .../i18n/google_docs.pot                      |   0
 .../{google_docs => google_drive}/i18n/hr.po  |   0
 .../{google_docs => google_drive}/i18n/hu.po  |   0
 .../{google_docs => google_drive}/i18n/it.po  |   0
 .../{google_docs => google_drive}/i18n/ln.po  |   0
 .../{google_docs => google_drive}/i18n/mk.po  |   0
 .../{google_docs => google_drive}/i18n/mn.po  |   0
 .../{google_docs => google_drive}/i18n/nl.po  |   0
 .../{google_docs => google_drive}/i18n/pl.po  |   0
 .../{google_docs => google_drive}/i18n/pt.po  |   0
 .../i18n/pt_BR.po                             |   0
 .../{google_docs => google_drive}/i18n/ro.po  |   0
 .../{google_docs => google_drive}/i18n/ru.po  |   0
 .../{google_docs => google_drive}/i18n/sl.po  |   0
 .../{google_docs => google_drive}/i18n/sv.po  |   0
 .../{google_docs => google_drive}/i18n/tr.po  |   0
 .../i18n/zh_CN.po                             |   0
 .../res_config_user_view.xml                  |  38 +++++++++---------
 .../google_drive/security/ir.model.access.csv |   3 ++
 .../static/lib/gapi/client.js                 |   0
 .../static/src/img/drive_icon.png             | Bin
 .../static/src/img/drive_icon_mono.png        | Bin
 .../static/src/img/icon.png                   | Bin
 .../static/src/js/gdrive.js}                  |  14 +++----
 39 files changed, 80 insertions(+), 80 deletions(-)
 delete mode 100644 addons/google_docs/__init__.py
 delete mode 100644 addons/google_docs/google_docs_data.xml
 delete mode 100644 addons/google_docs/security/ir.model.access.csv
 create mode 100644 addons/google_drive/__init__.py
 rename addons/{google_docs => google_drive}/__openerp__.py (94%)
 rename addons/{google_docs/google_docs.py => google_drive/google_drive.py} (87%)
 create mode 100644 addons/google_drive/google_drive_data.xml
 rename addons/{google_docs/google_docs_demo.xml => google_drive/google_drive_demo.xml} (76%)
 rename addons/{google_docs => google_drive}/i18n/ar.po (100%)
 rename addons/{google_docs => google_drive}/i18n/cs.po (100%)
 rename addons/{google_docs => google_drive}/i18n/de.po (100%)
 rename addons/{google_docs => google_drive}/i18n/es.po (100%)
 rename addons/{google_docs => google_drive}/i18n/fr.po (100%)
 rename addons/{google_docs => google_drive}/i18n/google_docs.pot (100%)
 rename addons/{google_docs => google_drive}/i18n/hr.po (100%)
 rename addons/{google_docs => google_drive}/i18n/hu.po (100%)
 rename addons/{google_docs => google_drive}/i18n/it.po (100%)
 rename addons/{google_docs => google_drive}/i18n/ln.po (100%)
 rename addons/{google_docs => google_drive}/i18n/mk.po (100%)
 rename addons/{google_docs => google_drive}/i18n/mn.po (100%)
 rename addons/{google_docs => google_drive}/i18n/nl.po (100%)
 rename addons/{google_docs => google_drive}/i18n/pl.po (100%)
 rename addons/{google_docs => google_drive}/i18n/pt.po (100%)
 rename addons/{google_docs => google_drive}/i18n/pt_BR.po (100%)
 rename addons/{google_docs => google_drive}/i18n/ro.po (100%)
 rename addons/{google_docs => google_drive}/i18n/ru.po (100%)
 rename addons/{google_docs => google_drive}/i18n/sl.po (100%)
 rename addons/{google_docs => google_drive}/i18n/sv.po (100%)
 rename addons/{google_docs => google_drive}/i18n/tr.po (100%)
 rename addons/{google_docs => google_drive}/i18n/zh_CN.po (100%)
 rename addons/{google_docs => google_drive}/res_config_user_view.xml (73%)
 create mode 100644 addons/google_drive/security/ir.model.access.csv
 rename addons/{google_docs => google_drive}/static/lib/gapi/client.js (100%)
 rename addons/{google_docs => google_drive}/static/src/img/drive_icon.png (100%)
 rename addons/{google_docs => google_drive}/static/src/img/drive_icon_mono.png (100%)
 rename addons/{google_docs => google_drive}/static/src/img/icon.png (100%)
 rename addons/{google_docs/static/src/js/gdocs.js => google_drive/static/src/js/gdrive.js} (85%)

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index dd815f09426..96ce669216a 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -36,7 +36,7 @@ class base_config_settings(osv.osv_memory):
             help="""Enable the public part of openerp, openerp becomes a public website."""),
         'module_auth_oauth': fields.boolean('Use external authentication providers, sign in with google, facebook, ...'),
         'module_base_import': fields.boolean("Allow users to import data from CSV files"),
-        'module_google_docs': fields.boolean('Attach a google document to any record',
+        'module_google_drive': fields.boolean('Attach a google document to any record',
             help="""This installs the module google_docs."""),
     }
 
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index a018d9e1c5b..fcb67c9fdc6 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -85,8 +85,8 @@
                         <label for="id" string="Google Drive"/>
                         <div name="google_drive">
                             <div name="google_docs">
-                                <field name="module_google_docs" class="oe_inline"/>
-                                <label for="module_google_docs"/>
+                                <field name="module_google_drive" class="oe_inline"/>
+                                <label for="module_google_drive"/>
                             </div>
                         </div>
                     </group>
diff --git a/addons/google_docs/__init__.py b/addons/google_docs/__init__.py
deleted file mode 100644
index dd6285502c0..00000000000
--- a/addons/google_docs/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-import google_docs
diff --git a/addons/google_docs/google_docs_data.xml b/addons/google_docs/google_docs_data.xml
deleted file mode 100644
index f674f0a8a31..00000000000
--- a/addons/google_docs/google_docs_data.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data noupdate="1">
-  
-         <record id="config_google_docs_client_id" model="ir.config_parameter">
-            <field name="key">google_docs_client_id</field>
-            <field name="value">39623646228-eg3ggo3mk6o40m7rguobi3rkl9frh4tb.apps.googleusercontent.com</field>
-        </record>
-        
-        <record id="config_google_docs_client_secret" model="ir.config_parameter">
-            <field name="key">google_docs_client_secret</field>
-            <field name="value">Ul-PtmnSWs3euWs20fdono0e</field>
-        </record>
-
-        <record id="config_google_docs_refresh_token" model="ir.config_parameter">
-            <field name="key">google_docs_refresh_token</field>
-            <field name="value">-</field>
-        </record>
-
-        <record id="config_google_docs_authorization_code" model="ir.config_parameter">
-            <field name="key">google_docs_authorization_code</field>
-            <field name="value">-</field>
-        </record>
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/google_docs/security/ir.model.access.csv b/addons/google_docs/security/ir.model.access.csv
deleted file mode 100644
index 1a2040784f8..00000000000
--- a/addons/google_docs/security/ir.model.access.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_google_docs_all,google.docs.config,model_google_docs_config,,1,0,0,0
-access_google_docs,google.docs.config,model_google_docs_config,base.group_system,1,1,1,1
\ No newline at end of file
diff --git a/addons/google_drive/__init__.py b/addons/google_drive/__init__.py
new file mode 100644
index 00000000000..e1cf2d00f3c
--- /dev/null
+++ b/addons/google_drive/__init__.py
@@ -0,0 +1 @@
+import google_drive
diff --git a/addons/google_docs/__openerp__.py b/addons/google_drive/__openerp__.py
similarity index 94%
rename from addons/google_docs/__openerp__.py
rename to addons/google_drive/__openerp__.py
index 8e4b2fa612e..d12d442f27a 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_drive/__openerp__.py
@@ -29,15 +29,15 @@
     'auto_install': False,
     'js': [
         'static/lib/gapi/client.js',
-        'static/src/js/gdocs.js',
+        'static/src/js/gdrive.js',
     ],
     'data': [
         'security/ir.model.access.csv',
         'res_config_user_view.xml',
-        'google_docs_data.xml'
+        'google_drive_data.xml'
     ],
     'demo': [
-        'google_docs_demo.xml'
+        'google_drive_demo.xml'
     ],
     'depends': ['base_setup', 'google_base_account'],
     'description': """
diff --git a/addons/google_docs/google_docs.py b/addons/google_drive/google_drive.py
similarity index 87%
rename from addons/google_docs/google_docs.py
rename to addons/google_drive/google_drive.py
index 8b0d8f53b2e..04834e6680b 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_drive/google_drive.py
@@ -33,7 +33,7 @@ import json
 _logger = logging.getLogger(__name__)
 
 class config(osv.osv):
-    _name = 'google.docs.config'
+    _name = 'google.drive.config'
     _description = "Google Drive templates config"
     
     def get_google_doc_name(self, cr, uid, ids, res_id, tamplate_id, context=None):
@@ -67,17 +67,17 @@ class config(osv.osv):
         return res
     
     def copy_doc(self, cr, uid, ids, res_id, tamplate_id, name_gdocs, res_model, context=None):
-        ir_config = self.pool[ 'ir.config_parameter' ]
-        google_docs_client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_docs_client_id')
-        google_docs_client_secret = ir_config.get_param(cr, SUPERUSER_ID, 'google_docs_client_secret')
-        google_docs_refresh_token = ir_config.get_param(cr, SUPERUSER_ID, 'google_docs_refresh_token')
+        ir_config = self.pool[ 'ir.config_parameter']
+        google_drive_client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_client_id')
+        google_drive_client_secret = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_client_secret')
+        google_drive_refresh_token = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_refresh_token')
         google_web_base_url = ir_config.get_param(cr, SUPERUSER_ID, 'web.base.url')
         
         #For Getting New Access Token With help of old Refresh Token 
         headers = {"Content-type": "application/x-www-form-urlencoded"}
-        data = dict(client_id = google_docs_client_id, 
-                    refresh_token = google_docs_refresh_token, 
-                    client_secret = google_docs_client_secret, 
+        data = dict(client_id = google_drive_client_id, 
+                    refresh_token = google_drive_refresh_token, 
+                    client_secret = google_drive_client_secret, 
                     grant_type = "refresh_token")
         data = urllib.urlencode(data) 
         resp, content = Http().request("https://accounts.google.com/o/oauth2/token", "POST", data, headers)
@@ -105,7 +105,7 @@ class config(osv.osv):
             raise self.pool.get('res.config.settings').get_config_warning(cr, _("You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %(menu:base_setup.menu_general_configuration)s."), context=context)
         return res
     
-    def get_google_docs_config(self, cr, uid, res_model, res_id, context=None):
+    def get_google_drive_config(self, cr, uid, res_model, res_id, context=None):
         '''
         Function called by the js, when no google doc are yet associated with a record, with the aim to create one. It
         will first seek for a google.docs.config associated with the model `res_model` to find out what's the template
@@ -154,7 +154,7 @@ class config(osv.osv):
     def _resource_get(self, cr, uid, ids, name, arg, context=None):
         result = {}
         for data in self.browse(cr, uid, ids, context):
-            template_url = data.gdocs_template_url
+            template_url = data.google_drive_template_url
             try:
                 url = urlparse(template_url)
                 res = url.path.split('/')
@@ -172,16 +172,16 @@ class config(osv.osv):
         result = {}
         for config_id in ids:
             config = self.pool['ir.config_parameter']
-            result[config_id] = config.get_param(cr, SUPERUSER_ID, 'google_docs_client_id')
+            result[config_id] = config.get_param(cr, SUPERUSER_ID, 'google_drive_client_id')
         return result
 
     _columns = {
         'name' : fields.char('Template Name', required=True, size=1024),
         'model_id': fields.selection(_list_all_models, 'Model', required=True),
         'filter_id' : fields.many2one('ir.filters', 'Filter'),
-        'gdocs_template_url': fields.char('Template URL', required=True, size=1024),
-        'gdocs_resource_id' : fields.function(_resource_get, type="char" , string='Resource Id'),
-        'google_docs_client_id' : fields.function(_client_id_get, type="char" , string='Google Client '),
+        'google_drive_template_url': fields.char('Template URL', required=True, size=1024),
+        'google_drive_resource_id' : fields.function(_resource_get, type="char" , string='Resource Id'),
+        'google_drive_client_id' : fields.function(_client_id_get, type="char" , string='Google Client '),
         '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),
     }
 
@@ -214,9 +214,9 @@ class base_config_settings(osv.osv):
     _inherit = "base.config.settings"
 
     _columns = {
-        'google_docs_authorization_code': fields.char('Paste Generated "Authorization Code" from google to here', size=124),
-        'google_docs_uri': fields.char('URI', readonly=True, help="The URL to generate the authorization code from Google"),
+        'google_drive_authorization_code': fields.char('Paste Generated "Authorization Code" from google to here', size=124),
+        'google_drive_uri': fields.char('URI', readonly=True, help="The URL to generate the authorization code from Google"),
     }
     _defaults = {
-        'google_docs_uri': lambda s, cr, uid, c: s._get_google_token_uri(cr, uid, 'docs', context=c),
+        'google_drive_uri': lambda s, cr, uid, c: s._get_google_token_uri(cr, uid, 'drive', context=c),
     }
diff --git a/addons/google_drive/google_drive_data.xml b/addons/google_drive/google_drive_data.xml
new file mode 100644
index 00000000000..9bb81e2744a
--- /dev/null
+++ b/addons/google_drive/google_drive_data.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+  
+         <record id="config_google_drive_client_id" model="ir.config_parameter">
+            <field name="key">google_drive_client_id</field>
+            <field name="value">39623646228-eg3ggo3mk6o40m7rguobi3rkl9frh4tb.apps.googleusercontent.com</field>
+        </record>
+        
+        <record id="config_google_drive_client_secret" model="ir.config_parameter">
+            <field name="key">google_drive_client_secret</field>
+            <field name="value">Ul-PtmnSWs3euWs20fdono0e</field>
+        </record>
+
+        <record id="config_google_drive_refresh_token" model="ir.config_parameter">
+            <field name="key">google_drive_refresh_token</field>
+            <field name="value">-</field>
+        </record>
+
+        <record id="config_google_drive_authorization_code" model="ir.config_parameter">
+            <field name="key">google_drive_authorization_code</field>
+            <field name="value">-</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/google_docs/google_docs_demo.xml b/addons/google_drive/google_drive_demo.xml
similarity index 76%
rename from addons/google_docs/google_docs_demo.xml
rename to addons/google_drive/google_drive_demo.xml
index 8dcafe0ea45..936257b99f2 100644
--- a/addons/google_docs/google_docs_demo.xml
+++ b/addons/google_drive/google_drive_demo.xml
@@ -11,11 +11,11 @@
         </record>
 
         <!-- template demo -->
-        <record id="template_partner" model="google.docs.config">
+        <record id="template_partner" model="google.drive.config">
             <field name="name">Customer Doc</field>
             <field name="model_id">res.partner</field>
             <field name="filter_id" ref="filter_partner"/>
-            <field name="gdocs_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
+            <field name="google_drive_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
             <field name="name_template">%(name)s_%(model)s_%(filter)s_gdrive</field>
         </record>
         
diff --git a/addons/google_docs/i18n/ar.po b/addons/google_drive/i18n/ar.po
similarity index 100%
rename from addons/google_docs/i18n/ar.po
rename to addons/google_drive/i18n/ar.po
diff --git a/addons/google_docs/i18n/cs.po b/addons/google_drive/i18n/cs.po
similarity index 100%
rename from addons/google_docs/i18n/cs.po
rename to addons/google_drive/i18n/cs.po
diff --git a/addons/google_docs/i18n/de.po b/addons/google_drive/i18n/de.po
similarity index 100%
rename from addons/google_docs/i18n/de.po
rename to addons/google_drive/i18n/de.po
diff --git a/addons/google_docs/i18n/es.po b/addons/google_drive/i18n/es.po
similarity index 100%
rename from addons/google_docs/i18n/es.po
rename to addons/google_drive/i18n/es.po
diff --git a/addons/google_docs/i18n/fr.po b/addons/google_drive/i18n/fr.po
similarity index 100%
rename from addons/google_docs/i18n/fr.po
rename to addons/google_drive/i18n/fr.po
diff --git a/addons/google_docs/i18n/google_docs.pot b/addons/google_drive/i18n/google_docs.pot
similarity index 100%
rename from addons/google_docs/i18n/google_docs.pot
rename to addons/google_drive/i18n/google_docs.pot
diff --git a/addons/google_docs/i18n/hr.po b/addons/google_drive/i18n/hr.po
similarity index 100%
rename from addons/google_docs/i18n/hr.po
rename to addons/google_drive/i18n/hr.po
diff --git a/addons/google_docs/i18n/hu.po b/addons/google_drive/i18n/hu.po
similarity index 100%
rename from addons/google_docs/i18n/hu.po
rename to addons/google_drive/i18n/hu.po
diff --git a/addons/google_docs/i18n/it.po b/addons/google_drive/i18n/it.po
similarity index 100%
rename from addons/google_docs/i18n/it.po
rename to addons/google_drive/i18n/it.po
diff --git a/addons/google_docs/i18n/ln.po b/addons/google_drive/i18n/ln.po
similarity index 100%
rename from addons/google_docs/i18n/ln.po
rename to addons/google_drive/i18n/ln.po
diff --git a/addons/google_docs/i18n/mk.po b/addons/google_drive/i18n/mk.po
similarity index 100%
rename from addons/google_docs/i18n/mk.po
rename to addons/google_drive/i18n/mk.po
diff --git a/addons/google_docs/i18n/mn.po b/addons/google_drive/i18n/mn.po
similarity index 100%
rename from addons/google_docs/i18n/mn.po
rename to addons/google_drive/i18n/mn.po
diff --git a/addons/google_docs/i18n/nl.po b/addons/google_drive/i18n/nl.po
similarity index 100%
rename from addons/google_docs/i18n/nl.po
rename to addons/google_drive/i18n/nl.po
diff --git a/addons/google_docs/i18n/pl.po b/addons/google_drive/i18n/pl.po
similarity index 100%
rename from addons/google_docs/i18n/pl.po
rename to addons/google_drive/i18n/pl.po
diff --git a/addons/google_docs/i18n/pt.po b/addons/google_drive/i18n/pt.po
similarity index 100%
rename from addons/google_docs/i18n/pt.po
rename to addons/google_drive/i18n/pt.po
diff --git a/addons/google_docs/i18n/pt_BR.po b/addons/google_drive/i18n/pt_BR.po
similarity index 100%
rename from addons/google_docs/i18n/pt_BR.po
rename to addons/google_drive/i18n/pt_BR.po
diff --git a/addons/google_docs/i18n/ro.po b/addons/google_drive/i18n/ro.po
similarity index 100%
rename from addons/google_docs/i18n/ro.po
rename to addons/google_drive/i18n/ro.po
diff --git a/addons/google_docs/i18n/ru.po b/addons/google_drive/i18n/ru.po
similarity index 100%
rename from addons/google_docs/i18n/ru.po
rename to addons/google_drive/i18n/ru.po
diff --git a/addons/google_docs/i18n/sl.po b/addons/google_drive/i18n/sl.po
similarity index 100%
rename from addons/google_docs/i18n/sl.po
rename to addons/google_drive/i18n/sl.po
diff --git a/addons/google_docs/i18n/sv.po b/addons/google_drive/i18n/sv.po
similarity index 100%
rename from addons/google_docs/i18n/sv.po
rename to addons/google_drive/i18n/sv.po
diff --git a/addons/google_docs/i18n/tr.po b/addons/google_drive/i18n/tr.po
similarity index 100%
rename from addons/google_docs/i18n/tr.po
rename to addons/google_drive/i18n/tr.po
diff --git a/addons/google_docs/i18n/zh_CN.po b/addons/google_drive/i18n/zh_CN.po
similarity index 100%
rename from addons/google_docs/i18n/zh_CN.po
rename to addons/google_drive/i18n/zh_CN.po
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_drive/res_config_user_view.xml
similarity index 73%
rename from addons/google_docs/res_config_user_view.xml
rename to addons/google_drive/res_config_user_view.xml
index 560c36cc99c..cbcbb46bc44 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_drive/res_config_user_view.xml
@@ -2,11 +2,11 @@
 <openerp>
     <data>
 
-        <!-- add google docs config field in user form -->
+        <!-- add google drive config field in user form -->
 
-        <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>
+        <record model="ir.ui.view" id="view_google_drive_config_tree">
+            <field name="name">google_drive.config.tree</field>
+            <field name="model">google.drive.config</field>
             <field name="arch" type="xml">
                 <tree string="Google Drive Configuration">
                     <field name="name" />
@@ -15,9 +15,9 @@
             </field>
         </record>
 
-        <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>
+        <record model="ir.ui.view" id="view_google_drive_config_form">
+            <field name="name">google_drive.config.form</field>
+            <field name="model">google.drive.config</field>
             <field name="arch" type="xml">
                 <form string="Google Drive Configuration" version="7.0">
                     <group>
@@ -35,8 +35,8 @@
                                 - If filter is not specified, link of google document will appear in "More" option for all users for all opportunities.
                             </p>
                         </div>
-                        <field name='gdocs_template_url' placeholder="https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcua4/edit" required="1" />
-                        <field name='gdocs_resource_id' invisible="1" />
+                        <field name='google_drive_template_url' placeholder="https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcua4/edit" required="1" />
+                        <field name='google_drive_resource_id' invisible="1" />
                         <label for='name_template' />
                         <div>
                             <field name='name_template' />
@@ -52,12 +52,12 @@
             </field>
         </record>
 
-        <record model='ir.actions.act_window' id='action_google_docs_users_config'>
+        <record model='ir.actions.act_window' id='action_google_drive_users_config'>
             <field name='name'>Google Drive Templates</field>
-            <field name='res_model'>google.docs.config</field>
+            <field name='res_model'>google.drive.config</field>
             <field name='type'>ir.actions.act_window</field>
             <field name='view_type'>form</field>
-            <field name='view_id' ref='view_google_docs_config_tree' />
+            <field name='view_id' ref='view_google_drive_config_tree' />
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                     Click to add a new template.
@@ -73,23 +73,23 @@
             <field name="model">base.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_general_configuration" />
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='google_docs']" position="after">
-                    <div attrs="{'invisible': [('module_google_docs','=',False)]}">
+                <xpath expr="//div[@name='google_drive']" position="after">
+                    <div attrs="{'invisible': [('module_google_drive','=',False)]}">
                         <p class="oe_gray" >
                             <div class="oe_inline">
-                                Click here to <field name="google_docs_uri" widget="url" text="Generate Google Authorization Code" class="oe_inline oe_bold"/>
+                                Click here to <field name="google_drive_uri" widget="url" text="Generate Google Authorization Code" class="oe_inline oe_bold"/>
                             </div>
                             <group>
-                                <field  name="google_docs_authorization_code" on_change="onchange_google_authorization_code('docs', google_docs_authorization_code)"/>''
+                                <field  name="google_drive_authorization_code" on_change="onchange_google_authorization_code('drive', google_drive_authorization_code)"/>''
                             </group>
-                            Configure your templates and link your google document to OpenERP records <button type="action" name="%(google_docs.action_google_docs_users_config)d" string="Configure Template" class="oe_link" />
+                            Configure your templates and link your google document to OpenERP records <button type="action" name="%(google_drive.action_google_drive_users_config)d" string="Configure Template" class="oe_link" />
                         </p>
                     </div>
                 </xpath>
             </field>
         </record>
 
-        <menuitem name='Google Drive configuration' id='menu_gdocs_config' parent='base.menu_administration' />
-        <menuitem id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config' />
+        <menuitem name='Google Drive configuration' id='menu_google_drive_config' parent='base.menu_administration' />
+        <menuitem id='menu_google_drive_model_config' parent='menu_google_drive_config' action='action_google_drive_users_config' />
     </data>
 </openerp>
diff --git a/addons/google_drive/security/ir.model.access.csv b/addons/google_drive/security/ir.model.access.csv
new file mode 100644
index 00000000000..ae98cb36976
--- /dev/null
+++ b/addons/google_drive/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_google_drive_all,google.drive.config,model_google_drive_config,,1,0,0,0
+access_google_drive,google.drive.config,model_google_drive_config,base.group_system,1,1,1,1
\ No newline at end of file
diff --git a/addons/google_docs/static/lib/gapi/client.js b/addons/google_drive/static/lib/gapi/client.js
similarity index 100%
rename from addons/google_docs/static/lib/gapi/client.js
rename to addons/google_drive/static/lib/gapi/client.js
diff --git a/addons/google_docs/static/src/img/drive_icon.png b/addons/google_drive/static/src/img/drive_icon.png
similarity index 100%
rename from addons/google_docs/static/src/img/drive_icon.png
rename to addons/google_drive/static/src/img/drive_icon.png
diff --git a/addons/google_docs/static/src/img/drive_icon_mono.png b/addons/google_drive/static/src/img/drive_icon_mono.png
similarity index 100%
rename from addons/google_docs/static/src/img/drive_icon_mono.png
rename to addons/google_drive/static/src/img/drive_icon_mono.png
diff --git a/addons/google_docs/static/src/img/icon.png b/addons/google_drive/static/src/img/icon.png
similarity index 100%
rename from addons/google_docs/static/src/img/icon.png
rename to addons/google_drive/static/src/img/icon.png
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_drive/static/src/js/gdrive.js
similarity index 85%
rename from addons/google_docs/static/src/js/gdocs.js
rename to addons/google_drive/static/src/js/gdrive.js
index 24385b3b85e..1bfcc603d51 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_drive/static/src/js/gdrive.js
@@ -1,4 +1,4 @@
-openerp.google_docs = function (instance, m) {
+openerp.google_drive = function (instance, m) {
     var _t = instance.web._t,
         QWeb = instance.web.qweb;
 
@@ -25,8 +25,8 @@ openerp.google_docs = function (instance, m) {
             }
             if (res_id) {
                 view.sidebar_eval_context().done(function (context) {
-                    var ds = new instance.web.DataSet(this, 'google.docs.config', context);
-                    ds.call('get_google_docs_config', [view.dataset.model, res_id, context]).done(function (r) {
+                    var ds = new instance.web.DataSet(this, 'google.drive.config', context);
+                    ds.call('get_google_drive_config', [view.dataset.model, res_id, context]).done(function (r) {
                         if (!_.isEmpty(r)) {
                             _.each(r, function (res) {
                                 var g_item = _.indexOf(_.pluck(self.items.other, 'label'), res.name);
@@ -34,7 +34,7 @@ openerp.google_docs = function (instance, m) {
                                     self.items.other.splice(g_item, 1);
                                 }
                                 self.add_items('other', [{
-                                        label: res.name+ '<img style="position:absolute;right:5px;height:20px;width:20px;" title="Google Drive" src="google_docs/static/src/img/drive_icon.png"/>',
+                                        label: res.name+ '<img style="position:absolute;right:5px;height:20px;width:20px;" title="Google Drive" src="google_drive/static/src/img/drive_icon.png"/>',
                                         config_id: res.id,
                                         res_id: res_id,
                                         res_model: view.dataset.model,
@@ -56,10 +56,10 @@ openerp.google_docs = function (instance, m) {
         on_google_doc: function (doc_item) {
             var self = this;
             self.config = doc_item;
-            var loaded = self.fetch('google.docs.config', ['gdocs_resource_id', 'google_docs_client_id'], [['id', '=', doc_item.config_id]])
+            var loaded = self.fetch('google.drive.config', ['google_drive_resource_id', 'google_drive_client_id'], [['id', '=', doc_item.config_id]])
                 .then(function (configs) {
-                var ds = new instance.web.DataSet(self, 'google.docs.config');
-                ds.call('get_google_doc_name', [[doc_item.config_id], doc_item.res_id,configs[0].gdocs_resource_id]).done(function (r) {
+                var ds = new instance.web.DataSet(self, 'google.drive.config');
+                ds.call('get_google_doc_name', [[doc_item.config_id], doc_item.res_id,configs[0].google_drive_resource_id]).done(function (r) {
                     if (!_.isEmpty(r)) {
                         _.each(r, function (res) {
                             if(res.url)

From 2da193d24289cd15d0b71e87f866751dc3dc0d46 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 26 Jun 2013 11:50:05 +0200
Subject: [PATCH 56/61] [FIX]base_setup,google_drive: res_config view
 correction for module google drive

bzr revid: dle@openerp.com-20130626095005-wx9x79pmqg8o2de7
---
 addons/base_setup/res_config_view.xml        |  2 +-
 addons/google_drive/google_drive.py          |  2 +-
 addons/google_drive/res_config_user_view.xml | 17 +++++++----------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index fcb67c9fdc6..73685be95df 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -84,7 +84,7 @@
                     <group>
                         <label for="id" string="Google Drive"/>
                         <div name="google_drive">
-                            <div name="google_docs">
+                            <div name="module_google_drive">
                                 <field name="module_google_drive" class="oe_inline"/>
                                 <label for="module_google_drive"/>
                             </div>
diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py
index 04834e6680b..02045b06c7c 100644
--- a/addons/google_drive/google_drive.py
+++ b/addons/google_drive/google_drive.py
@@ -214,7 +214,7 @@ class base_config_settings(osv.osv):
     _inherit = "base.config.settings"
 
     _columns = {
-        'google_drive_authorization_code': fields.char('Paste Generated "Authorization Code" from google to here', size=124),
+        'google_drive_authorization_code': fields.char('Authorization Code', size=124),
         'google_drive_uri': fields.char('URI', readonly=True, help="The URL to generate the authorization code from Google"),
     }
     _defaults = {
diff --git a/addons/google_drive/res_config_user_view.xml b/addons/google_drive/res_config_user_view.xml
index cbcbb46bc44..6bb6ed3a5b3 100644
--- a/addons/google_drive/res_config_user_view.xml
+++ b/addons/google_drive/res_config_user_view.xml
@@ -73,17 +73,14 @@
             <field name="model">base.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_general_configuration" />
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='google_drive']" position="after">
+                <xpath expr="//div[@name='module_google_drive']" position="after">
                     <div attrs="{'invisible': [('module_google_drive','=',False)]}">
-                        <p class="oe_gray" >
-                            <div class="oe_inline">
-                                Click here to <field name="google_drive_uri" widget="url" text="Generate Google Authorization Code" class="oe_inline oe_bold"/>
-                            </div>
-                            <group>
-                                <field  name="google_drive_authorization_code" on_change="onchange_google_authorization_code('drive', google_drive_authorization_code)"/>''
-                            </group>
-                            Configure your templates and link your google document to OpenERP records <button type="action" name="%(google_drive.action_google_drive_users_config)d" string="Configure Template" class="oe_link" />
-                        </p>
+                        <div class="oe_inline">
+                            <field name="google_drive_uri" widget="url" text="Generate Google Authorization Code" class="oe_inline oe_bold"/>
+                            and paste it here
+                            <field name="google_drive_authorization_code" on_change="onchange_google_authorization_code('drive', google_drive_authorization_code)" class="oe_inline" />
+                        </div>
+                        <button type="action" name="%(google_drive.action_google_drive_users_config)d" string="Configure your templates" class="oe_link" />
                     </div>
                 </xpath>
             </field>

From 66520d9e8e3d62eb4bec66ccd797211d3841c13f Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 26 Jun 2013 11:57:36 +0200
Subject: [PATCH 57/61] [FLAKE8]

bzr revid: dle@openerp.com-20130626095736-0ni7i86wckc6coo5
---
 addons/base_setup/res_config.py     |  2 +-
 addons/google_drive/__openerp__.py  |  2 +-
 addons/google_drive/google_drive.py | 75 ++++++++++++++---------------
 3 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 96ce669216a..1e5169fc2b3 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -37,7 +37,7 @@ class base_config_settings(osv.osv_memory):
         'module_auth_oauth': fields.boolean('Use external authentication providers, sign in with google, facebook, ...'),
         'module_base_import': fields.boolean("Allow users to import data from CSV files"),
         'module_google_drive': fields.boolean('Attach a google document to any record',
-            help="""This installs the module google_docs."""),
+                                              help="""This installs the module google_docs."""),
     }
 
     def open_company(self, cr, uid, ids, context=None):
diff --git a/addons/google_drive/__openerp__.py b/addons/google_drive/__openerp__.py
index d12d442f27a..9e6c73d2649 100644
--- a/addons/google_drive/__openerp__.py
+++ b/addons/google_drive/__openerp__.py
@@ -44,7 +44,7 @@
 Integrate google document to OpenERP record.
 ============================================
 
-This module allows you to integrate google documents to any of your OpenERP record quickly and easily using OAuth 2.0 for Installed Applications, 
+This module allows you to integrate google documents to any of your OpenERP record quickly and easily using OAuth 2.0 for Installed Applications,
 You can configure your google Authorization Code from Settings > Configuration > General Settings by clicking on "Generate Google Authorization Code"
 """
 }
diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py
index 02045b06c7c..61e64f011f5 100644
--- a/addons/google_drive/google_drive.py
+++ b/addons/google_drive/google_drive.py
@@ -18,9 +18,7 @@
 #
 ##############################################################################
 import logging
-from datetime import datetime
 
-from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
 from openerp import SUPERUSER_ID
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
@@ -32,10 +30,11 @@ import json
 
 _logger = logging.getLogger(__name__)
 
+
 class config(osv.osv):
     _name = 'google.drive.config'
     _description = "Google Drive templates config"
-    
+
     def get_google_doc_name(self, cr, uid, ids, res_id, tamplate_id, context=None):
         pool_model = self.pool.get("ir.model")
         res = {}
@@ -48,13 +47,13 @@ class config(osv.osv):
             model_name = model.name
             filter_name = config.filter_id and config.filter_id.name or False
             record = self.pool.get(res_model).read(cr, uid, res_id, [], context=context)
-            record.update({'model': model_name, 'filter':filter_name})
+            record.update({'model': model_name, 'filter': filter_name})
             name_gdocs = config.name_template or "%(name)s_%(model)s_%(filter)s_gdrive"
             try:
                 name_gdocs = name_gdocs % record
             except:
                 raise osv.except_osv(_('Key Error!'), _("Your Google Doc Name Pattern's key does not found in object."))
-            
+
             attach_pool = self.pool.get("ir.attachment")
             attach_ids = attach_pool.search(cr, uid, [('res_model', '=', res_model), ('name', '=', name_gdocs), ('res_id', '=', res_id)])
             url = False
@@ -65,51 +64,51 @@ class config(osv.osv):
                 url = self.copy_doc(cr, uid, ids, res_id, tamplate_id, name_gdocs, res_model, context)
             res[config.id] = {'url': url}
         return res
-    
+
     def copy_doc(self, cr, uid, ids, res_id, tamplate_id, name_gdocs, res_model, context=None):
-        ir_config = self.pool[ 'ir.config_parameter']
+        ir_config = self.pool['ir.config_parameter']
         google_drive_client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_client_id')
         google_drive_client_secret = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_client_secret')
         google_drive_refresh_token = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_refresh_token')
         google_web_base_url = ir_config.get_param(cr, SUPERUSER_ID, 'web.base.url')
-        
-        #For Getting New Access Token With help of old Refresh Token 
+
+        #For Getting New Access Token With help of old Refresh Token
         headers = {"Content-type": "application/x-www-form-urlencoded"}
-        data = dict(client_id = google_drive_client_id, 
-                    refresh_token = google_drive_refresh_token, 
-                    client_secret = google_drive_client_secret, 
-                    grant_type = "refresh_token")
-        data = urllib.urlencode(data) 
+        data = dict(client_id=google_drive_client_id,
+                    refresh_token=google_drive_refresh_token,
+                    client_secret=google_drive_client_secret,
+                    grant_type="refresh_token")
+        data = urllib.urlencode(data)
         resp, content = Http().request("https://accounts.google.com/o/oauth2/token", "POST", data, headers)
         content = json.loads(content)
-        
+
         # Copy template in to drive with help of new access token
-        if content.has_key('access_token'):
+        if 'access_token' in content:
             request_url = "https://www.googleapis.com/drive/v2/files/%s?fields=parents/id&access_token=%s" % (tamplate_id, content['access_token'])
             resp, parents = Http().request(request_url, "GET")
             parents_dict = json.loads(parents)
 
             headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
-            record_url = "Click on link to open Record in OpenERP\n %s/?db=%s#id=%s&model=%s" %(google_web_base_url, cr.dbname, res_id, res_model ) 
-            data = {"title": name_gdocs, "description": record_url, "parents":parents_dict['parents']}
+            record_url = "Click on link to open Record in OpenERP\n %s/?db=%s#id=%s&model=%s" % (google_web_base_url, cr.dbname, res_id, res_model)
+            data = {"title": name_gdocs, "description": record_url, "parents": parents_dict['parents']}
             request_url = "https://www.googleapis.com/drive/v2/files/%s/copy?access_token=%s" % (tamplate_id, content['access_token'])
             resp, content = Http().request(request_url, "POST", json.dumps(data), headers)
             content = json.loads(content)
             res = False
             if 'alternateLink' in content.keys():
                 attach_pool = self.pool.get("ir.attachment")
-                attach_vals = {'res_model': res_model, 'name': name_gdocs, 'res_id': res_id, 'type': 'url', 'url':content['alternateLink']}
+                attach_vals = {'res_model': res_model, 'name': name_gdocs, 'res_id': res_id, 'type': 'url', 'url': content['alternateLink']}
                 attach_pool.create(cr, uid, attach_vals)
                 res = content['alternateLink']
         else:
             raise self.pool.get('res.config.settings').get_config_warning(cr, _("You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %(menu:base_setup.menu_general_configuration)s."), context=context)
         return res
-    
+
     def get_google_drive_config(self, cr, uid, res_model, res_id, context=None):
         '''
         Function called by the js, when no google doc are yet associated with a record, with the aim to create one. It
         will first seek for a google.docs.config associated with the model `res_model` to find out what's the template
-        of google doc to copy (this is usefull if you want to start with a non-empty document, a type or a name 
+        of google doc to copy (this is usefull if you want to start with a non-empty document, a type or a name
         different than the default values). If no config is associated with the `res_model`, then a blank text document
         with a default name is created.
           :param res_model: the object for which the google doc is created
@@ -122,21 +121,20 @@ class config(osv.osv):
         # check if a model is configured with a template
         config_ids = self.search(cr, uid, [('model_id', '=', res_model)], context=context)
         configs = []
-        for config  in self.browse(cr, SUPERUSER_ID, config_ids, context=context):
+        for config in self.browse(cr, SUPERUSER_ID, config_ids, context=context):
             if config.filter_id:
                 if (config.filter_id.user_id and config.filter_id.user_id.id != uid):
                     #Private
                     continue
                 google_doc_configs = self._filter(cr, uid, config, config.filter_id, res_id, context=context)
-                if google_doc_configs: 
+                if google_doc_configs:
                     configs.append({'id': config.id, 'name': config.name})
             else:
                 configs.append({'id': config.id, 'name': config.name})
         return configs
-    
+
     def _filter(self, cr, uid, action, action_filter, record_ids, context=None):
         """ filter the list record_ids that satisfy the action filter """
-        records = {}
         if record_ids and action_filter:
             if not action.model_id == action_filter.model_id:
                 raise osv.except_osv(_('Warning!'), _("Something went wrong with the configuration of attachments with google drive.Please contact your Administrator to fix the problem."))
@@ -146,11 +144,11 @@ class config(osv.osv):
             ctx.update(eval(action_filter.context))
             record_ids = model.search(cr, uid, domain, context=ctx)
         return record_ids
-    
+
     def _list_all_models(self, cr, uid, context=None):
         cr.execute("SELECT model, name from ir_model order by name")
         return cr.fetchall()
-    
+
     def _resource_get(self, cr, uid, ids, name, arg, context=None):
         result = {}
         for data in self.browse(cr, uid, ids, context):
@@ -158,7 +156,6 @@ class config(osv.osv):
             try:
                 url = urlparse(template_url)
                 res = url.path.split('/')
-                resource = res[1]
                 if res[1] == "spreadsheet":
                     key = url.query.split('=')[1]
                 else:
@@ -167,7 +164,7 @@ class config(osv.osv):
             except:
                 raise osv.except_osv(_('Incorrect URL!'), _("Please enter a valid URL."))
         return result
-    
+
     def _client_id_get(self, cr, uid, ids, name, arg, context=None):
         result = {}
         for config_id in ids:
@@ -176,27 +173,27 @@ class config(osv.osv):
         return result
 
     _columns = {
-        'name' : fields.char('Template Name', required=True, size=1024),
+        'name': fields.char('Template Name', required=True, size=1024),
         'model_id': fields.selection(_list_all_models, 'Model', required=True),
-        'filter_id' : fields.many2one('ir.filters', 'Filter'),
+        'filter_id': fields.many2one('ir.filters', 'Filter'),
         'google_drive_template_url': fields.char('Template URL', required=True, size=1024),
-        'google_drive_resource_id' : fields.function(_resource_get, type="char" , string='Resource Id'),
-        'google_drive_client_id' : fields.function(_client_id_get, type="char" , string='Google Client '),
+        'google_drive_resource_id': fields.function(_resource_get, type="char", string='Resource Id'),
+        'google_drive_client_id': fields.function(_client_id_get, type="char", string='Google Client '),
         '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),
     }
 
     def onchange_model_id(self, cr, uid, ids, model_id, context=None):
-         res = {'domain':{'filter_id':[]}}
-         if model_id:
+        res = {'domain': {'filter_id': []}}
+        if model_id:
             res['domain'] = {'filter_id': [('model_id', '=', model_id)]}
-         else:
-             res['value'] = {'filter_id': False}
-         return res
+        else:
+            res['value'] = {'filter_id': False}
+        return res
 
     _defaults = {
         'name_template': '%(name)s_%(model)s_%(filter)s_gdrive',
     }
-    
+
     def _check_model_id(self, cr, uid, ids, context=None):
         config_id = self.browse(cr, uid, ids[0], context=context)
         if config_id.filter_id.id and config_id.model_id != config_id.filter_id.model_id:

From fab8c0682f957de584fa8c693b0afed20e5978a7 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 26 Jun 2013 17:07:19 +0200
Subject: [PATCH 58/61] [IMP]google_drive: ressource_id with regex

bzr revid: dle@openerp.com-20130626150719-ry3wdngld3wfmdrt
---
 addons/base_setup/res_config.py     |  2 +-
 addons/google_drive/google_drive.py | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 1e5169fc2b3..6b8578bbf47 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -36,7 +36,7 @@ class base_config_settings(osv.osv_memory):
             help="""Enable the public part of openerp, openerp becomes a public website."""),
         'module_auth_oauth': fields.boolean('Use external authentication providers, sign in with google, facebook, ...'),
         'module_base_import': fields.boolean("Allow users to import data from CSV files"),
-        'module_google_drive': fields.boolean('Attach a google document to any record',
+        'module_google_drive': fields.boolean('Attach Google documents to any record',
                                               help="""This installs the module google_docs."""),
     }
 
diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py
index 982caf9f9c6..c41678976aa 100644
--- a/addons/google_drive/google_drive.py
+++ b/addons/google_drive/google_drive.py
@@ -26,6 +26,7 @@ from openerp.tools.translate import _
 import urllib
 import urllib2
 import json
+import re
 
 _logger = logging.getLogger(__name__)
 
@@ -130,14 +131,10 @@ class config(osv.osv):
     def _resource_get(self, cr, uid, ids, name, arg, context=None):
         result = {}
         for data in self.browse(cr, uid, ids, context):
-            template_url = data.google_drive_template_url
-            try:
-                if '/spreadsheet/' in template_url:
-                    key = template_url.split('key=')[1]
-                else:
-                    key = template_url.split('/d/')[1].split('/')[0]
-                result[data.id] = str(key)
-            except IndexError:
+            mo = re.search("(key=|/d/)([A-Za-z0-9-]+)", data.google_drive_template_url)
+            if mo:
+                result[data.id] = mo.group(2)
+            else:
                 raise osv.except_osv(_('Incorrect URL!'), _("Please enter a valid Google Document URL."))
         return result
 

From 1d85a0648c659ef2be5ceb23ce581e5f0ac1ff4d Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 26 Jun 2013 19:00:35 +0200
Subject: [PATCH 59/61] [FIX]google_drive,google_base_account: back to httpllib

bzr revid: dle@openerp.com-20130626170035-rd4rzil801vbzxro
---
 .../google_base_account/google_base_account.py   | 14 +++++---------
 addons/google_drive/google_drive.py              | 16 +++++++++-------
 addons/google_drive/google_drive_demo.xml        |  4 ++--
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/addons/google_base_account/google_base_account.py b/addons/google_base_account/google_base_account.py
index 8ee600467b3..d733b6da77c 100644
--- a/addons/google_base_account/google_base_account.py
+++ b/addons/google_base_account/google_base_account.py
@@ -22,8 +22,8 @@
 from openerp.osv import osv
 from openerp import SUPERUSER_ID
 
+from httplib2 import Http
 import urllib
-import urllib2
 import simplejson
 
 
@@ -38,14 +38,10 @@ class base_config_settings(osv.osv):
             redirect_uri = ir_config.get_param(cr, SUPERUSER_ID, 'google_redirect_uri')
 
             #Get the Refresh Token From Google And store it in ir.config_parameter
-            data = {
-                'code': authorization_code,
-                'client_id': client_id,
-                'client_secret': client_secret,
-                'redirect_uri': redirect_uri,
-                'grant_type': "authorization_code",
-            }
-            resp, content = urllib2.urlopen("https://accounts.google.com/o/oauth2/token", urllib.urlencode(data))
+            headers = {"Content-type": "application/x-www-form-urlencoded"}
+            data = dict(code=authorization_code, client_id=client_id, client_secret=client_secret, redirect_uri=redirect_uri, grant_type="authorization_code")
+            data = urllib.urlencode(data)
+            resp, content = Http().request("https://accounts.google.com/o/oauth2/token", "POST", data, headers)
             content = simplejson.loads(content)
             if 'refresh_token' in content.keys():
                 ir_config.set_param(cr, uid, 'google_%s_refresh_token' % service, content['refresh_token'])
diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py
index c41678976aa..6bf3a01c905 100644
--- a/addons/google_drive/google_drive.py
+++ b/addons/google_drive/google_drive.py
@@ -23,8 +23,8 @@ from openerp import SUPERUSER_ID
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 
+from httplib2 import Http
 import urllib
-import urllib2
 import json
 import re
 
@@ -41,7 +41,7 @@ class config(osv.osv):
         filter_name = config.filter_id and config.filter_id.name or False
         record = self.pool.get(model.model).read(cr, uid, res_id, [], context=context)
         record.update({'model': model.name, 'filter': filter_name})
-        name_gdocs = config.name_template or "%(name)s_%(model)s_%(filter)s_gdrive"
+        name_gdocs = config.name_template
         try:
             name_gdocs = name_gdocs % record
         except:
@@ -65,26 +65,28 @@ class config(osv.osv):
         google_web_base_url = ir_config.get_param(cr, SUPERUSER_ID, 'web.base.url')
 
         #For Getting New Access Token With help of old Refresh Token
+        headers = {"Content-type": "application/x-www-form-urlencoded"}
         data = dict(client_id=google_drive_client_id,
                     refresh_token=google_drive_refresh_token,
                     client_secret=google_drive_client_secret,
                     grant_type="refresh_token")
+
         data = urllib.urlencode(data)
-        content = urllib2.urlopen("https://accounts.google.com/o/oauth2/token", data).read()
+        resp, content = Http().request("https://accounts.google.com/o/oauth2/token", "POST", data, headers)
         content = json.loads(content)
 
         # Copy template in to drive with help of new access token
         if 'access_token' in content:
             request_url = "https://www.googleapis.com/drive/v2/files/%s?fields=parents/id&access_token=%s" % (template_id, content['access_token'])
-            parents = urllib2.urlopen(request_url).read()
+            resp, parents = Http().request(request_url, "GET")
             parents_dict = json.loads(parents)
 
             record_url = "Click on link to open Record in OpenERP\n %s/?db=%s#id=%s&model=%s" % (google_web_base_url, cr.dbname, res_id, res_model)
             data = {"title": name_gdocs, "description": record_url, "parents": parents_dict['parents']}
             request_url = "https://www.googleapis.com/drive/v2/files/%s/copy?access_token=%s" % (template_id, content['access_token'])
+            headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
             data_json = json.dumps(data)
-            req = urllib2.Request(request_url, data_json, {'Content-Type': 'application/json', 'Content-Length': len(data_json)})
-            content = urllib2.urlopen(req).read()
+            resp, content = Http().request(request_url, "POST", data_json, headers)
             content = json.loads(content)
             res = False
             if 'alternateLink' in content.keys():
@@ -166,7 +168,7 @@ class config(osv.osv):
         return res
 
     _defaults = {
-        'name_template': '%(name)s_%(model)s_%(filter)s_gdrive',
+        'name_template': 'Document %(name)s',
     }
 
     def _check_model_id(self, cr, uid, ids, context=None):
diff --git a/addons/google_drive/google_drive_demo.xml b/addons/google_drive/google_drive_demo.xml
index 330d1d4a66b..ebe73f40ec2 100644
--- a/addons/google_drive/google_drive_demo.xml
+++ b/addons/google_drive/google_drive_demo.xml
@@ -12,11 +12,11 @@
 
         <!-- template demo -->
         <record id="template_partner" model="google.drive.config">
-            <field name="name">Customer Doc</field>
+            <field name="name">Partner Review</field>
             <field name="model_id" ref="base.model_res_partner"/>
             <field name="filter_id" ref="filter_partner"/>
             <field name="google_drive_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
-            <field name="name_template">%(name)s_%(model)s_%(filter)s_gdrive</field>
+            <field name="name_template">Partner Review %(name)s</field>
         </record>
         
     </data>

From fa228290afc9cbf6d068c20287c4b314723686f7 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 27 Jun 2013 16:37:13 +0200
Subject: [PATCH 60/61] [FIX]google_drive: refresh token from authorization
 code not anymore in on change method, google base account not inheriting from
 base setting

bzr revid: dle@openerp.com-20130627143713-lgqgi0px7qb18rup
---
 .../google_base_account.py                    | 20 +++++++------
 addons/google_drive/google_drive.py           | 28 +++++++++++++------
 addons/google_drive/google_drive_data.xml     |  6 +---
 addons/google_drive/res_config_user_view.xml  |  2 +-
 4 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/addons/google_base_account/google_base_account.py b/addons/google_base_account/google_base_account.py
index d733b6da77c..a6cf67bbe62 100644
--- a/addons/google_base_account/google_base_account.py
+++ b/addons/google_base_account/google_base_account.py
@@ -21,16 +21,17 @@
 
 from openerp.osv import osv
 from openerp import SUPERUSER_ID
+from openerp.tools.translate import _
 
-from httplib2 import Http
 import urllib
+import urllib2
 import simplejson
 
 
-class base_config_settings(osv.osv):
-    _inherit = "base.config.settings"
+class google_service(osv.osv):
+    _name = 'google.service'
 
-    def onchange_google_authorization_code(self, cr, uid, ids, service, authorization_code, context=None):
+    def generate_refresh_token(self, cr, uid, service, authorization_code, context=None):
         if authorization_code:
             ir_config = self.pool['ir.config_parameter']
             client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_%s_client_id' % service)
@@ -41,11 +42,14 @@ class base_config_settings(osv.osv):
             headers = {"Content-type": "application/x-www-form-urlencoded"}
             data = dict(code=authorization_code, client_id=client_id, client_secret=client_secret, redirect_uri=redirect_uri, grant_type="authorization_code")
             data = urllib.urlencode(data)
-            resp, content = Http().request("https://accounts.google.com/o/oauth2/token", "POST", data, headers)
+            try:
+                req = urllib2.Request("https://accounts.google.com/o/oauth2/token", data, headers)
+                content = urllib2.urlopen(req).read()
+            except urllib2.HTTPError:
+                raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong during your token generation. Maybe your Authorization Code is invalid or already expired"), context=context)
+
             content = simplejson.loads(content)
-            if 'refresh_token' in content.keys():
-                ir_config.set_param(cr, uid, 'google_%s_refresh_token' % service, content['refresh_token'])
-        return {}
+        return content.get('refresh_token')
 
     def _get_google_token_uri(self, cr, uid, service, context=None):
         ir_config = self.pool['ir.config_parameter']
diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py
index 6bf3a01c905..e6cecfad596 100644
--- a/addons/google_drive/google_drive.py
+++ b/addons/google_drive/google_drive.py
@@ -23,8 +23,8 @@ from openerp import SUPERUSER_ID
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 
-from httplib2 import Http
 import urllib
+import urllib2
 import json
 import re
 
@@ -59,26 +59,31 @@ class config(osv.osv):
 
     def copy_doc(self, cr, uid, res_id, template_id, name_gdocs, res_model, context=None):
         ir_config = self.pool['ir.config_parameter']
+        google_drive_refresh_token = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_refresh_token')
+        if not google_drive_refresh_token:
+            raise self.pool.get('res.config.settings').get_config_warning(cr, _("You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %(menu:base_setup.menu_general_configuration)s."), context=context)
         google_drive_client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_client_id')
         google_drive_client_secret = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_client_secret')
-        google_drive_refresh_token = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_refresh_token')
         google_web_base_url = ir_config.get_param(cr, SUPERUSER_ID, 'web.base.url')
 
         #For Getting New Access Token With help of old Refresh Token
-        headers = {"Content-type": "application/x-www-form-urlencoded"}
+        headers = {"Content-type": "application/x-www-form-urlencoded", "Accept-Encoding": "gzip, deflate"}
         data = dict(client_id=google_drive_client_id,
                     refresh_token=google_drive_refresh_token,
                     client_secret=google_drive_client_secret,
                     grant_type="refresh_token")
 
         data = urllib.urlencode(data)
-        resp, content = Http().request("https://accounts.google.com/o/oauth2/token", "POST", data, headers)
+        req = urllib2.Request('https://accounts.google.com/o/oauth2/token', data, headers)
+        content = urllib2.urlopen(req).read()
         content = json.loads(content)
 
         # Copy template in to drive with help of new access token
         if 'access_token' in content:
             request_url = "https://www.googleapis.com/drive/v2/files/%s?fields=parents/id&access_token=%s" % (template_id, content['access_token'])
-            resp, parents = Http().request(request_url, "GET")
+            req = urllib2.Request(request_url, None, headers)
+            # resp, parents = Http().request(request_url, "GET")
+            parents = urllib2.urlopen(req).read()
             parents_dict = json.loads(parents)
 
             record_url = "Click on link to open Record in OpenERP\n %s/?db=%s#id=%s&model=%s" % (google_web_base_url, cr.dbname, res_id, res_model)
@@ -86,7 +91,9 @@ class config(osv.osv):
             request_url = "https://www.googleapis.com/drive/v2/files/%s/copy?access_token=%s" % (template_id, content['access_token'])
             headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
             data_json = json.dumps(data)
-            resp, content = Http().request(request_url, "POST", data_json, headers)
+            # resp, content = Http().request(request_url, "POST", data_json, headers)
+            req = urllib2.Request(request_url, data_json, headers)
+            content = urllib2.urlopen(req).read()
             content = json.loads(content)
             res = False
             if 'alternateLink' in content.keys():
@@ -94,8 +101,6 @@ class config(osv.osv):
                 attach_vals = {'res_model': res_model, 'name': name_gdocs, 'res_id': res_id, 'type': 'url', 'url': content['alternateLink']}
                 attach_pool.create(cr, uid, attach_vals)
                 res = content['alternateLink']
-        else:
-            raise self.pool.get('res.config.settings').get_config_warning(cr, _("You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %(menu:base_setup.menu_general_configuration)s."), context=context)
         return res
 
     def get_google_drive_config(self, cr, uid, res_model, res_id, context=None):
@@ -192,5 +197,10 @@ class base_config_settings(osv.osv):
         'google_drive_uri': fields.char('URI', readonly=True, help="The URL to generate the authorization code from Google"),
     }
     _defaults = {
-        'google_drive_uri': lambda s, cr, uid, c: s._get_google_token_uri(cr, uid, 'drive', context=c),
+        'google_drive_uri': lambda s, cr, uid, c: s.pool['google.service']._get_google_token_uri(cr, uid, 'drive', context=c),
     }
+
+    def set_google_authorization_code(self, cr, uid, ids, context=None):
+        config = self.browse(cr, uid, ids[0], context)
+        refresh_token = self.pool['google.service'].generate_refresh_token(cr, uid, 'drive', config.google_drive_authorization_code, context=context)
+        self.pool['ir.config_parameter'].set_param(cr, uid, 'google_drive_refresh_token', refresh_token)
diff --git a/addons/google_drive/google_drive_data.xml b/addons/google_drive/google_drive_data.xml
index 9bb81e2744a..6204f455bf3 100644
--- a/addons/google_drive/google_drive_data.xml
+++ b/addons/google_drive/google_drive_data.xml
@@ -14,12 +14,8 @@
 
         <record id="config_google_drive_refresh_token" model="ir.config_parameter">
             <field name="key">google_drive_refresh_token</field>
-            <field name="value">-</field>
+            <field name="value"></field>
         </record>
 
-        <record id="config_google_drive_authorization_code" model="ir.config_parameter">
-            <field name="key">google_drive_authorization_code</field>
-            <field name="value">-</field>
-        </record>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/google_drive/res_config_user_view.xml b/addons/google_drive/res_config_user_view.xml
index 8dfdee31143..728ef03c5dd 100644
--- a/addons/google_drive/res_config_user_view.xml
+++ b/addons/google_drive/res_config_user_view.xml
@@ -79,7 +79,7 @@
                         <div class="oe_inline">
                             <field name="google_drive_uri" widget="url" text="Generate Google Authorization Code" class="oe_inline oe_bold"/>
                             and paste it here
-                            <field name="google_drive_authorization_code" on_change="onchange_google_authorization_code('drive', google_drive_authorization_code)" class="oe_inline" />
+                            <field name="google_drive_authorization_code" class="oe_inline" />
                         </div>
                         <button type="action" name="%(google_drive.action_google_drive_users_config)d" string="Configure your templates" class="oe_link" />
                     </div>

From bf1163c99a842f35ba96245b300eba42c1f6f7e6 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 27 Jun 2013 17:01:45 +0200
Subject: [PATCH 61/61] [FIX]google_drive: resource_get func fields,
 ressource_id can have '_' in id, remove of refresh_token in data(useless),
 try except for various urllib calls

bzr revid: dle@openerp.com-20130627150145-4fruh3ysqoce7bcj
---
 addons/google_drive/google_drive.py       | 17 +++++++++++------
 addons/google_drive/google_drive_data.xml |  5 -----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py
index e6cecfad596..1dc6b25f27c 100644
--- a/addons/google_drive/google_drive.py
+++ b/addons/google_drive/google_drive.py
@@ -74,16 +74,21 @@ class config(osv.osv):
                     grant_type="refresh_token")
 
         data = urllib.urlencode(data)
-        req = urllib2.Request('https://accounts.google.com/o/oauth2/token', data, headers)
-        content = urllib2.urlopen(req).read()
+        try:
+            req = urllib2.Request('https://accounts.google.com/o/oauth2/token', data, headers)
+            content = urllib2.urlopen(req).read()
+        except urllib2.HTTPError:
+            raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong during the token generation. Please request again an authorization code in %(menu:base_setup.menu_general_configuration)s."), context=context)
         content = json.loads(content)
 
         # Copy template in to drive with help of new access token
         if 'access_token' in content:
             request_url = "https://www.googleapis.com/drive/v2/files/%s?fields=parents/id&access_token=%s" % (template_id, content['access_token'])
-            req = urllib2.Request(request_url, None, headers)
-            # resp, parents = Http().request(request_url, "GET")
-            parents = urllib2.urlopen(req).read()
+            try:
+                req = urllib2.Request(request_url, None, headers)
+                parents = urllib2.urlopen(req).read()
+            except urllib2.HTTPError:
+                raise self.pool.get('res.config.settings').get_config_warning(cr, _("The Google Template cannot be found. Maybe it has been deleted."), context=context)
             parents_dict = json.loads(parents)
 
             record_url = "Click on link to open Record in OpenERP\n %s/?db=%s#id=%s&model=%s" % (google_web_base_url, cr.dbname, res_id, res_model)
@@ -138,7 +143,7 @@ class config(osv.osv):
     def _resource_get(self, cr, uid, ids, name, arg, context=None):
         result = {}
         for data in self.browse(cr, uid, ids, context):
-            mo = re.search("(key=|/d/)([A-Za-z0-9-]+)", data.google_drive_template_url)
+            mo = re.search("(key=|/d/)([A-Za-z0-9-_]+)", data.google_drive_template_url)
             if mo:
                 result[data.id] = mo.group(2)
             else:
diff --git a/addons/google_drive/google_drive_data.xml b/addons/google_drive/google_drive_data.xml
index 6204f455bf3..c9266547969 100644
--- a/addons/google_drive/google_drive_data.xml
+++ b/addons/google_drive/google_drive_data.xml
@@ -12,10 +12,5 @@
             <field name="value">Ul-PtmnSWs3euWs20fdono0e</field>
         </record>
 
-        <record id="config_google_drive_refresh_token" model="ir.config_parameter">
-            <field name="key">google_drive_refresh_token</field>
-            <field name="value"></field>
-        </record>
-
     </data>
 </openerp>
\ No newline at end of file