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: [IMP]Renaming google docs to google drive

bzr revid: dhr@tinyerp.com-20130225091639-s0m5xd110yozak0q
---
 addons/google_docs/res_config_user_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [IMP]Creating a tempalate for automatically creating a doc

bzr revid: dhr@tinyerp.com-20130226055525-dvrlc9siy0cb8knl
---
 addons/google_docs/res_config_user_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [IMP]Reverted google doc configuration from documents menu as per new
 spec

bzr revid: dhr@tinyerp.com-20130228065250-4v5n75cit1afhabd
---
 addons/google_docs/res_config_user_view.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [IMP]Changed the model template

bzr revid: dhr@tinyerp.com-20130228072822-dxbuk1jjljcofp82
---
 addons/google_docs/res_config_user_view.xml | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [IMP] google_docs : google docs configuration added to general
 settings

bzr revid: rpr@tinyerp.com-20130228083647-xrglmy1sfha0d3ep
---
 addons/google_docs/res_config_user_view.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [IMP]Putting a domain of filter to see only filters of the choosen
 model.

bzr revid: dhr@tinyerp.com-20130304052058-fzs7a6ct9d1xb5so
---
 addons/google_docs/res_config_user_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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'/>
-- 
cgit v1.2.3


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: [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/res_config_user_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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'/>
-- 
cgit v1.2.3


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: [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/res_config_user_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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.
-- 
cgit v1.2.3


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: [IMP]Adding name field and displaying message for empty list

bzr revid: dhr@tinyerp.com-20130311132929-0pw8rtaxyj8ke9tx
---
 addons/google_docs/res_config_user_view.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'addons/google_docs/res_config_user_view.xml')

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">
-- 
cgit v1.2.3


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: [IMP]Changed code for name template

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

(limited to 'addons/google_docs/res_config_user_view.xml')

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.
-- 
cgit v1.2.3


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: [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(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [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/google_docs/res_config_user_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [IMP]Made changes as per the review of RPA on 19th march

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

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [IMP] google_docs : constraint added

bzr revid: rpr@tinyerp.com-20130320082956-yuwftz4vp6xq11au
---
 addons/google_docs/res_config_user_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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'/>
-- 
cgit v1.2.3


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: [IMP] google_docs : Made changes as per the review of RPA on 21th
 march

bzr revid: rpr@tinyerp.com-20130322122859-2s1wd5tba9u58g5f
---
 addons/google_docs/res_config_user_view.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [IMP] google_docs : changes for empty list and user preference google
 account

bzr revid: rpr@tinyerp.com-20130326074122-5h8b40ubel4ssgrp
---
 addons/google_docs/res_config_user_view.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [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(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [IMP] google_docs : changes for code and rpa review 28 march

bzr revid: rpr@tinyerp.com-20130401080323-vdw9rgdvzi0qyqrf
---
 addons/google_docs/res_config_user_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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.
-- 
cgit v1.2.3


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: [IMP] google_docs : changes for user field in filters

bzr revid: rpr@tinyerp.com-20130401093152-02ux70o02dxp5a2a
---
 addons/google_docs/res_config_user_view.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [IMP] google_docs : changes for tooltip and name_template

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

(limited to 'addons/google_docs/res_config_user_view.xml')

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"/>
-- 
cgit v1.2.3


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: [IMP] google_docs : changes for google template creation for user

bzr revid: rpr@tinyerp.com-20130404070523-3wt0hcot93jw6fop
---
 addons/google_docs/res_config_user_view.xml | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [IMP] google_docs : changes for tooltip of filter

bzr revid: rpr@tinyerp.com-20130404095619-lrvwxdc3w42pdaki
---
 addons/google_docs/res_config_user_view.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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"/>
-- 
cgit v1.2.3


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: [FiX] added OAuth , google account login through OAuth

bzr revid: pga@tinyerp.com-20130509141001-s9gtsdfnwxlgvsls
---
 addons/google_docs/res_config_user_view.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [IMP] Improved Code

bzr revid: pga@tinyerp.com-20130510063501-szrjvvh4jhzy4x7j
---
 addons/google_docs/res_config_user_view.xml | 160 ++++++++++++++--------------
 1 file changed, 80 insertions(+), 80 deletions(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [IMP] Improved Code

bzr revid: pga@tinyerp.com-20130510091333-gmn2gwdo48jglsfu
---
 addons/google_docs/res_config_user_view.xml | 174 ++++++++++++++--------------
 1 file changed, 87 insertions(+), 87 deletions(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [IMP]Google client id in ir.config_parameter

bzr revid: pga@tinyerp.com-20130522102857-fehfsdks1fq3zc1i
---
 addons/google_docs/res_config_user_view.xml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [ADD] Added OAuth integration through python, Added Documentation

bzr revid: pga@tinyerp.com-20130523104155-83gmp2gucvackppv
---
 addons/google_docs/res_config_user_view.xml | 34 ++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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' />
-- 
cgit v1.2.3


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: [IMP] Moved Google Authorization Code to General Setting

bzr revid: pga@tinyerp.com-20130523133848-0i3j6h3rzj5a66pd
---
 addons/google_docs/res_config_user_view.xml | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [ADD] Added extra explanation in General Setting

bzr revid: pga@tinyerp.com-20130524060544-2v2q47t4gds4p6uz
---
 addons/google_docs/res_config_user_view.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [IMP] Improved Code

bzr revid: pga@tinyerp.com-20130529074629-4x7dooxgbq5g6hdc
---
 addons/google_docs/res_config_user_view.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/google_docs/res_config_user_view.xml')

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)"/>
-- 
cgit v1.2.3


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: [FIX]google_docs: generic function moved in base account

bzr revid: dle@openerp.com-20130625105819-l8d2zu0vf4tzne2t
---
 addons/google_docs/res_config_user_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [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_docs/res_config_user_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'addons/google_docs/res_config_user_view.xml')

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>
-- 
cgit v1.2.3


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: [RENAME]google_docs => google_drive

bzr revid: dle@openerp.com-20130626093019-krwt5eamagmd5amu
---
 addons/google_docs/res_config_user_view.xml | 95 -----------------------------
 1 file changed, 95 deletions(-)
 delete mode 100644 addons/google_docs/res_config_user_view.xml

(limited to 'addons/google_docs/res_config_user_view.xml')

diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
deleted file mode 100644
index 560c36cc99c..00000000000
--- a/addons/google_docs/res_config_user_view.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- 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_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 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)]}">
-                        <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"/>
-                            </div>
-                            <group>
-                                <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>
-                    </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' />
-    </data>
-</openerp>
-- 
cgit v1.2.3