From 733f236a4fdb48bc11d13326a7bf485c77204e44 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Wed, 30 May 2012 19:16:13 +0530
Subject: config wizard cleanup

bzr revid: tta@openerp.com-20120530134613-bv6x9be14yho6nqr
---
 addons/base_setup/res_config_view.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'addons/base_setup/res_config_view.xml')

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 0281263397a..464c11af4c7 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -23,6 +23,11 @@
                         <field name="module_share"/>
                         <newline/>
                         <field name="module_portal"/>
+                        <group col="4" colspan="4" >
+                            <p>You will also find several configuration options on your company data; address for the header and footer, overdue payments texts, etc.</p>
+                            <newline/>
+                            <p><button string="Configure Your Company Data"/></p>
+                        </group>
                     </sheet>
                 </form>
             </field>
-- 
cgit v1.2.3


From df1bf6336457285c7ee445672450e366f6174000 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Thu, 31 May 2012 13:07:26 +0530
Subject: Add Button : Configure your company data.

bzr revid: tta@openerp.com-20120531073726-00c9wpokzx6dtvhh
---
 addons/base_setup/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_setup/res_config_view.xml')

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 464c11af4c7..737bc6fb72b 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -26,7 +26,7 @@
                         <group col="4" colspan="4" >
                             <p>You will also find several configuration options on your company data; address for the header and footer, overdue payments texts, etc.</p>
                             <newline/>
-                            <p><button string="Configure Your Company Data"/></p>
+                            <p><button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/></p>
                         </group>
                     </sheet>
                 </form>
-- 
cgit v1.2.3


From 63a3d0fe188a6817e0cbfbabf2e8791215153062 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 1 Jun 2012 14:51:08 +0530
Subject: [fix] label are now bold

bzr revid: tta@openerp.com-20120601092108-zmh8qxqexqibb0lp
---
 addons/base_setup/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_setup/res_config_view.xml')

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 737bc6fb72b..b8acd43dff3 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -16,7 +16,7 @@
                         <field name="module_multi_company"/>
 
                         <separator string="Others" colspan="4"/>
-                        <label string="Outgoing Mail Servers"/>
+                        <b><label string="Outgoing Mail Servers"/></b>
                         <button type="action" name="%(base.action_ir_mail_server_list)d"
                             string="Configure" icon="gtk-execute"/>
                         <newline/>
-- 
cgit v1.2.3


From 0a377b68c8a93eada4e94ffadb9259c7e15572ba Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Thu, 7 Jun 2012 16:01:54 +0530
Subject: [IMP]improve general apply button red color in configuration wizard

bzr revid: pja@tinyerp.com-20120607103154-db1r7fzlz82prgb8
---
 addons/base_setup/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_setup/res_config_view.xml')

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index ccf231924fe..0902793a52d 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="General Settings" layout="manual">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Apply" type="object" name="execute" class="oe_form_button_hi"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet layout="auto">
-- 
cgit v1.2.3


From ea65a49a94e51b9bc92b7541f5b7ab1bf19dd856 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 22 Jun 2012 11:49:40 +0200
Subject: [IMP] base_setup: move all res_config wizards to res_config files,
 and change xml id of sale.config.settings view

bzr revid: rco@openerp.com-20120622094940-jacovvqfyym0zjov
---
 addons/base_setup/res_config_view.xml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'addons/base_setup/res_config_view.xml')

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 5707dac82e9..81f83a1dde1 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -43,5 +43,38 @@
         <menuitem id="menu_general_configuration" parent="base.menu_config"
             sequence="100" action="action_general_configuration"/>
 
+        <!-- Sale config wizard -->
+        <record id="view_sale_config_settings" model="ir.ui.view">
+            <field name="name">sale settings</field>
+            <field name="model">sale.config.settings</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Configure Sales" version="7.0">
+                    <header>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Cancel" special="cancel"/>
+                    </header>
+                    <sheet>
+                        <field name="module_crm" invisible="1"/>
+                        <group name="config_sale"/>
+                        <group name="config_fetchmail" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}">
+                            <field name="module_plugin_thunderbird"/>
+                            <field name="module_plugin_outlook"/>
+                        </group>
+                        <group name="config_crm"/>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_sale_config" model="ir.actions.act_window">
+            <field name="name">Configure Sales</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.config.settings</field>
+            <field name="view_id" ref="view_sale_config_settings"/>
+            <field name="view_mode">form</field>
+            <field name="target">inline</field>
+        </record>
+
     </data>
 </openerp>
-- 
cgit v1.2.3


From 0ac4fecbf4150440046237a07cca8e2245c5ad5c Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 22 Jun 2012 12:20:36 +0200
Subject: [IMP] base_setup: improve layout of general settings form

bzr revid: rco@openerp.com-20120622102036-ibnfb5pr09ooh7p8
---
 addons/base_setup/res_config_view.xml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'addons/base_setup/res_config_view.xml')

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 81f83a1dde1..cb72509e70a 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -11,25 +11,29 @@
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <group>
+                    <sheet>
                         <group string="Company Settings">
-                            <field name="module_multi_company"/>
-                        </group>
-                        <group string="Others">
-                           <b><label string="Outgoing Mail Servers"/></b>
-                            <button type="action" name="%(base.action_ir_mail_server_list)d"
-                                string="Configure" icon="gtk-execute"/>
+                            <group>
+                                <field name="module_multi_company"/>
+                            </group>
+                            <group>
+                                <div>
+                                    You will also find several configuration options on your company data:
+                                    address for the header and footer, overdue payments texts, etc.
+                                </div>
+                                <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
+                            </group>
                         </group>
                         <group string="External Accesses">
                             <field name="module_share"/>
                             <field name="module_portal"/>
                         </group>
-                        <group col="4" colspan="4" >
-                           <p>You will also find several configuration options on your company data; address for the header and footer, overdue payments texts, etc.</p>
-                           <newline/>
-                           <p><button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/></p>
+                        <group string="Others">
+                            <label for="id" string="Outgoing Mail Servers"/>
+                            <button type="action" name="%(base.action_ir_mail_server_list)d"
+                                string="Configure" icon="gtk-execute"/>
                         </group>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
-- 
cgit v1.2.3


From 12ae053fba1389f3352c4ae7de9f2f797417c246 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 25 Jun 2012 15:55:04 +0200
Subject: [IMP] in all config wizards, add class 'oe_highlight_on_dirty' on
 button 'Apply'

bzr revid: rco@openerp.com-20120625135504-0f03j2j6p7d1pp7l
---
 addons/base_setup/res_config_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/base_setup/res_config_view.xml')

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index cb72509e70a..de991fe6725 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="General Settings" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet>
@@ -55,7 +55,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Sales" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet>
-- 
cgit v1.2.3


From 0806d443e823af7dbc90405ba7446dc2f4f7f2b1 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 26 Jun 2012 09:49:46 +0200
Subject: [IMP] config wizards: add an action on button 'Cancel' to get the
 expected behavior

bzr revid: rco@openerp.com-20120626074946-a1tzebh85ta6v75l
---
 addons/base_setup/res_config_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/base_setup/res_config_view.xml')

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index de991fe6725..93523f06746 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -9,7 +9,7 @@
                 <form string="General Settings" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group string="Company Settings">
@@ -56,7 +56,7 @@
                 <form string="Configure Sales" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <field name="module_crm" invisible="1"/>
-- 
cgit v1.2.3


From 90094ff19b4d015cc64114467aeaf016ac36650c Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Wed, 27 Jun 2012 20:20:49 +0530
Subject: [FIX] setting cancel link

bzr revid: jam@tinyerp.com-20120627145049-hu0h8x0ui3d74sz0
---
 addons/base_setup/res_config_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/base_setup/res_config_view.xml')

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 93523f06746..4b5a4b0344b 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -9,7 +9,8 @@
                 <form string="General Settings" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" type="object" name="cancel"/>
+                        or
+                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <sheet>
                         <group string="Company Settings">
-- 
cgit v1.2.3


From c44963d631fe49eed02aacbabe97924e5a00e26c Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 28 Jun 2012 11:47:20 +0530
Subject: [FIX] added missing or and removed duplicate class

bzr revid: jam@tinyerp.com-20120628061720-1y5oacjqehjlplqc
---
 addons/base_setup/res_config_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/base_setup/res_config_view.xml')

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 4b5a4b0344b..0ad8bc45335 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -57,7 +57,8 @@
                 <form string="Configure Sales" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" type="object" name="cancel"/>
+                        or
+                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <sheet>
                         <field name="module_crm" invisible="1"/>
-- 
cgit v1.2.3


From 5133bee1d529722cd690188d61d51debd2d91968 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Jun 2012 10:30:24 +0200
Subject: [FIX] in form views, replace class 'oe_highlight_on_dirty' by
 'oe_highlight'

bzr revid: rco@openerp.com-20120629083024-rqhtbf9melkygg0m
---
 addons/base_setup/res_config_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/base_setup/res_config_view.xml')

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 0ad8bc45335..85a20bddf52 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="General Settings" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
@@ -56,7 +56,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Sales" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-- 
cgit v1.2.3