From 49b2920b8298e20e12944bb067f3ede1b02d07b7 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Mon, 27 Feb 2012 11:26:35 +0530
Subject: [IMP]: Improved code.

bzr revid: uco@tinyerp.com-20120227055635-ugxsh4rh6flw3ryu
---
 addons/plugin_outlook/plugin_outlook.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'addons/plugin_outlook/plugin_outlook.xml')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 37b924f319f..68e265e0730 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -48,11 +48,16 @@
             <field name="target">new</field>
         </record>
 
-        <record id="outlook_installer_todo" model="ir.actions.todo">
-            <field name="action_id" ref="action_outlook_installer"/>
-            <field name="category_id" ref="base.category_sales_management_config"/>
-            <field name="sequence">4</field>
-            <field name="type">automatic</field>
+        <record id="view_config_outlook_installer" model="ir.ui.view">
+            <field name="name">Sales Application</field>
+            <field name="model">sale.configuration</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_config_picking_policy"/>
+            <field name="arch" type="xml">
+                <field name="plugin_outlook" position="after">
+                    <button name="%(action_outlook_installer)d" type="action" string="Configure Outlook Plug-In" icon="gtk-execute" colspan="2"/>
+                </field>
+            </field>
         </record>
 
         <record id="action_outlook_wizard" model="ir.actions.act_window">
-- 
cgit v1.2.3


From adc65d5cfadcb18f0322ad9c6315960697d60491 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Wed, 29 Feb 2012 15:20:21 +0530
Subject: [IMP]: Improved code: added functionality to the respected modules.
 Added get and set methods.

bzr revid: uco@tinyerp.com-20120229095021-ogpd1s4nyxa7wdns
---
 addons/plugin_outlook/plugin_outlook.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/plugin_outlook/plugin_outlook.xml')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 68e265e0730..b03932c7e94 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -48,9 +48,9 @@
             <field name="target">new</field>
         </record>
 
-        <record id="view_config_outlook_installer" model="ir.ui.view">
+        <!--record id="view_config_outlook_installer" model="ir.ui.view">
             <field name="name">Sales Application</field>
-            <field name="model">sale.configuration</field>
+            <field name="model">res.config</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_config_picking_policy"/>
             <field name="arch" type="xml">
@@ -58,7 +58,7 @@
                     <button name="%(action_outlook_installer)d" type="action" string="Configure Outlook Plug-In" icon="gtk-execute" colspan="2"/>
                 </field>
             </field>
-        </record>
+        </record-->
 
         <record id="action_outlook_wizard" model="ir.actions.act_window">
             <field name="name">Install Outlook Plug-In</field>
-- 
cgit v1.2.3


From 5d98b230ab2bb42b60358820c9bb28486b3ab64d Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Wed, 29 Feb 2012 18:32:34 +0530
Subject: [IMP]: Improved code for tax templates. Revoked view for plugins_xx.

bzr revid: uco@tinyerp.com-20120229130234-99e485onvwj3q0lx
---
 addons/plugin_outlook/plugin_outlook.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/plugin_outlook/plugin_outlook.xml')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index b03932c7e94..8dd0ec481a8 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -48,17 +48,17 @@
             <field name="target">new</field>
         </record>
 
-        <!--record id="view_config_outlook_installer" model="ir.ui.view">
+        <record id="view_config_outlook_installer" model="ir.ui.view">
             <field name="name">Sales Application</field>
             <field name="model">res.config</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_config_picking_policy"/>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
                 <field name="plugin_outlook" position="after">
                     <button name="%(action_outlook_installer)d" type="action" string="Configure Outlook Plug-In" icon="gtk-execute" colspan="2"/>
                 </field>
             </field>
-        </record-->
+        </record>
 
         <record id="action_outlook_wizard" model="ir.actions.act_window">
             <field name="name">Install Outlook Plug-In</field>
-- 
cgit v1.2.3


From 2d1f03fa5270bb64c78a6ead6be84970e8a9532d Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Thu, 1 Mar 2012 10:26:21 +0530
Subject: [IMP]: Improved default get code. Improved views. Fixed account chart
 error.

bzr revid: uco@tinyerp.com-20120301045621-ntwm1o22ruy7940u
---
 addons/plugin_outlook/plugin_outlook.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/plugin_outlook/plugin_outlook.xml')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 8dd0ec481a8..27fd8d6d11f 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -55,7 +55,7 @@
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
                 <field name="plugin_outlook" position="after">
-                    <button name="%(action_outlook_installer)d" type="action" string="Configure Outlook Plug-In" icon="gtk-execute" colspan="2"/>
+                    <button name="%(action_outlook_installer)d" type="action" string="Configure" icon="gtk-execute"/>
                 </field>
             </field>
         </record>
-- 
cgit v1.2.3


From 4be6bcc9b13491fe1ae9edce1c858a94e56825d4 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Fri, 2 Mar 2012 14:20:38 +0530
Subject: [IMP]: Improved views, code according to new specifications. Improved
 tooltips

bzr revid: uco@tinyerp.com-20120302085038-z8isyuwxhw7vp6hh
---
 addons/plugin_outlook/plugin_outlook.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/plugin_outlook/plugin_outlook.xml')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 27fd8d6d11f..33a94dc2b42 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -52,9 +52,9 @@
             <field name="name">Sales Application</field>
             <field name="model">res.config</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_view_base"/>
+            <field name="inherit_id" ref="base.res_config_view_for_all"/>
             <field name="arch" type="xml">
-                <field name="plugin_outlook" position="after">
+                <field name="module_plugin_outlook" position="after">
                     <button name="%(action_outlook_installer)d" type="action" string="Configure" icon="gtk-execute"/>
                 </field>
             </field>
-- 
cgit v1.2.3


From 696681f571e2ccbce8fe416f7d46c6004f27f87a Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Fri, 2 Mar 2012 18:57:15 +0530
Subject: [REF]: Commented plugin views temporary.

bzr revid: uco@tinyerp.com-20120302132715-j87g58zv571tmgup
---
 addons/plugin_outlook/plugin_outlook.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'addons/plugin_outlook/plugin_outlook.xml')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 33a94dc2b42..d86445c014d 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -48,7 +48,8 @@
             <field name="target">new</field>
         </record>
 
-        <record id="view_config_outlook_installer" model="ir.ui.view">
+        <!-- NEED TO BE IMPROVED -->
+        <!--record id="view_config_outlook_installer" model="ir.ui.view">
             <field name="name">Sales Application</field>
             <field name="model">res.config</field>
             <field name="type">form</field>
@@ -58,7 +59,7 @@
                     <button name="%(action_outlook_installer)d" type="action" string="Configure" icon="gtk-execute"/>
                 </field>
             </field>
-        </record>
+        </record-->
 
         <record id="action_outlook_wizard" model="ir.actions.act_window">
             <field name="name">Install Outlook Plug-In</field>
-- 
cgit v1.2.3


From 9c536a772c06118a724a6d26487c20e8e807106c Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Sat, 3 Mar 2012 12:49:07 +0530
Subject: [IMP,FIX]: Fixed problem of plugin installation. Improved fetchmail
 code.

bzr revid: uco@tinyerp.com-20120303071907-kk0942ijn0ztouak
---
 addons/plugin_outlook/plugin_outlook.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/plugin_outlook/plugin_outlook.xml')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index d86445c014d..ef1797b19b2 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -48,18 +48,18 @@
             <field name="target">new</field>
         </record>
 
-        <!-- NEED TO BE IMPROVED -->
-        <!--record id="view_config_outlook_installer" model="ir.ui.view">
+        <!-- Sales Configuration -->
+        <record id="view_config_outlook_installer" model="ir.ui.view">
             <field name="name">Sales Application</field>
             <field name="model">res.config</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_view_for_all"/>
+            <field name="inherit_id" ref="mail.view_sales_config_plugin"/>
             <field name="arch" type="xml">
                 <field name="module_plugin_outlook" position="after">
-                    <button name="%(action_outlook_installer)d" type="action" string="Configure" icon="gtk-execute"/>
+                    <button name="%(action_outlook_installer)d" type="action" string="Configure Outlook" icon="gtk-execute"/>
                 </field>
             </field>
-        </record-->
+        </record>
 
         <record id="action_outlook_wizard" model="ir.actions.act_window">
             <field name="name">Install Outlook Plug-In</field>
-- 
cgit v1.2.3


From 05477792a40a0e51382a5ebe81ed893aa40bddb0 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Mon, 5 Mar 2012 10:41:33 +0530
Subject: [IMP]: Improved code to use new object res.config.settings for
 application settings.

bzr revid: uco@tinyerp.com-20120305051133-rj71925yxncp432a
---
 addons/plugin_outlook/plugin_outlook.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/plugin_outlook/plugin_outlook.xml')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index ef1797b19b2..5effe8324ac 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -51,7 +51,7 @@
         <!-- Sales Configuration -->
         <record id="view_config_outlook_installer" model="ir.ui.view">
             <field name="name">Sales Application</field>
-            <field name="model">res.config</field>
+            <field name="model">res.config.settings</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="mail.view_sales_config_plugin"/>
             <field name="arch" type="xml">
-- 
cgit v1.2.3


From de835f766da81b7d5c3d576b548d31cb15f3524f Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Wed, 7 Mar 2012 11:14:40 +0530
Subject: [IMP]: Improved all modules to change according to new changes on
 server. Added res.config.settings object for all configurations.

bzr revid: uco@tinyerp.com-20120307054440-uu1nrjhqbanj0sjb
---
 addons/plugin_outlook/plugin_outlook.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/plugin_outlook/plugin_outlook.xml')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 5effe8324ac..efdbea7b412 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -53,7 +53,7 @@
             <field name="name">Sales Application</field>
             <field name="model">res.config.settings</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="mail.view_sales_config_plugin"/>
+            <field name="inherit_id" ref="mail.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <field name="module_plugin_outlook" position="after">
                     <button name="%(action_outlook_installer)d" type="action" string="Configure Outlook" icon="gtk-execute"/>
-- 
cgit v1.2.3


From 66fe179546b37ebe2ecf4a50d1f5375f3d20171b Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 7 Mar 2012 14:26:32 +0530
Subject: [IMP] improved code

bzr revid: tpa@tinyerp.com-20120307085632-h0vowj2353pc20eo
---
 addons/plugin_outlook/plugin_outlook.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/plugin_outlook/plugin_outlook.xml')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index efdbea7b412..5effe8324ac 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -53,7 +53,7 @@
             <field name="name">Sales Application</field>
             <field name="model">res.config.settings</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="mail.view_sale_config_settings"/>
+            <field name="inherit_id" ref="mail.view_sales_config_plugin"/>
             <field name="arch" type="xml">
                 <field name="module_plugin_outlook" position="after">
                     <button name="%(action_outlook_installer)d" type="action" string="Configure Outlook" icon="gtk-execute"/>
-- 
cgit v1.2.3


From 0e526bd3299c105d54e2117d3aaaaa1b07e5752e Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 20 Mar 2012 14:50:02 +0100
Subject: [FIX] sale config: use model sale.config.settings instead of
 res.config.settings

bzr revid: rco@openerp.com-20120320135002-0gsazmlgock4gmnl
---
 addons/plugin_outlook/plugin_outlook.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/plugin_outlook/plugin_outlook.xml')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 5effe8324ac..8bf8993709b 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -51,7 +51,7 @@
         <!-- Sales Configuration -->
         <record id="view_config_outlook_installer" model="ir.ui.view">
             <field name="name">Sales Application</field>
-            <field name="model">res.config.settings</field>
+            <field name="model">sale.config.settings</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="mail.view_sales_config_plugin"/>
             <field name="arch" type="xml">
-- 
cgit v1.2.3


From a9e02f7df1af511f7a0d9bff0f807bd0b78057d0 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 21 Mar 2012 11:47:59 +0100
Subject: [IMP] sale config plugins: improve tooltip text

bzr revid: rco@openerp.com-20120321104759-kj5pn2rv7o1y26pm
---
 addons/plugin_outlook/plugin_outlook.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/plugin_outlook/plugin_outlook.xml')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 8bf8993709b..429fbf97a32 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -56,7 +56,7 @@
             <field name="inherit_id" ref="mail.view_sales_config_plugin"/>
             <field name="arch" type="xml">
                 <field name="module_plugin_outlook" position="after">
-                    <button name="%(action_outlook_installer)d" type="action" string="Configure Outlook" icon="gtk-execute"/>
+                    <button name="%(action_outlook_installer)d" type="action" string="Configure" icon="gtk-execute"/>
                 </field>
             </field>
         </record>
-- 
cgit v1.2.3


From e2f047bde8ea683bf23be0c197eb6d39a033e566 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 23 Mar 2012 10:12:45 +0100
Subject: [IMP] crm, sale: improve config wizard view

bzr revid: rco@openerp.com-20120323091245-4pw6nt31amyvo3gl
---
 addons/plugin_outlook/plugin_outlook.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'addons/plugin_outlook/plugin_outlook.xml')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 429fbf97a32..d16907306d1 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -56,7 +56,10 @@
             <field name="inherit_id" ref="mail.view_sales_config_plugin"/>
             <field name="arch" type="xml">
                 <field name="module_plugin_outlook" position="after">
-                    <button name="%(action_outlook_installer)d" type="action" string="Configure" icon="gtk-execute"/>
+                    <group colspan="2">
+                        <button name="%(action_outlook_installer)d" type="action"
+                            string="Configure Outlook plugin" icon="gtk-execute"/>
+                    </group>
                 </field>
             </field>
         </record>
-- 
cgit v1.2.3


From d56385b55f4eac78fdf944711fde2c9d1f15b556 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 30 Mar 2012 15:55:46 +0200
Subject: [IMP] sale.config.settings: show the 'Emails' section only when crm
 is installed

bzr revid: rco@openerp.com-20120330135546-jnmi8nbdmdg42rt7
---
 addons/plugin_outlook/plugin_outlook.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/plugin_outlook/plugin_outlook.xml')

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index d16907306d1..d2671859c79 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -53,10 +53,10 @@
             <field name="name">Sales Application</field>
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="mail.view_sales_config_plugin"/>
+            <field name="inherit_id" ref="base.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <field name="module_plugin_outlook" position="after">
-                    <group colspan="2">
+                    <group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
                         <button name="%(action_outlook_installer)d" type="action"
                             string="Configure Outlook plugin" icon="gtk-execute"/>
                     </group>
-- 
cgit v1.2.3