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: [PATCH] [IMP] crm, sale: improve config wizard view

bzr revid: rco@openerp.com-20120323091245-4pw6nt31amyvo3gl
---
 addons/crm/res_config_view.xml                | 17 +++--
 addons/plugin_outlook/plugin_outlook.xml      |  5 +-
 .../plugin_thunderbird/plugin_thunderbird.xml |  5 +-
 addons/sale/res_config_view.xml               | 63 +++++++++----------
 4 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 32d84ce3b67..b97fc110166 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="mail.view_sales_config_plugin"/>
             <field name="arch" type="xml">
-                <group name="config_emails" position="inside">
+                <group name="config_emails" position="before">
                     <separator string="Emails" colspan="4"/>
                     <field name="fetchmail_crm"/>
                     <group colspan="2" attrs="{'invisible': [('fetchmail_crm','=',False)]}">
@@ -16,22 +16,19 @@
                         <field name="default_type" nolabel="1" on_change="onchange_server_type(default_type, default_is_ssl)" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
                         <field name="default_port" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
                         <field name="default_is_ssl" on_change="onchange_server_type(default_type, default_is_ssl)"/>
-                        <newline/>
                         <field name="default_user" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
                         <field name="default_password" password="True" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
                     </group>
                 </group>
-                <group name="config_crm" position="inside">
+                <group name="config_crm" position="after">
                     <separator string="Import and Synchronize data from an other application" colspan="4"/>
-                    <group colspan="2" col="2">
-                        <field name="module_import_sugarcrm"/>
-                        <field name="module_import_google"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <field name="module_crm_caldav"/>
-                    </group>
+                    <field name="module_import_sugarcrm"/>
+                    <field name="module_crm_caldav"/>
+                    <field name="module_import_google"/>
+
                     <separator string="Documents and Wiki" colspan="4"/>
                     <field name="module_wiki_sale_faq" />
+
                     <separator string="Customer Form" colspan="4"/>
                     <field name="module_base_contact"/>
                     <field name="module_google_map"/>
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>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index ee4801d8925..ee7fce86d34 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -63,7 +63,10 @@
         <field name="inherit_id" ref="mail.view_sales_config_plugin"/>
         <field name="arch" type="xml">
             <field name="module_plugin_thunderbird" position="after">
-                <button name="%(action_thunderbird_installer)d" type="action" string="Configure" icon="gtk-execute"/>
+                <group colspan="2">
+                    <button name="%(action_thunderbird_installer)d" type="action"
+                        string="Configure Thunderbird plugin" icon="gtk-execute"/>
+                </group>
             </field>
         </field>
     </record>
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index c7bffa13ca3..9d3445e144d 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -8,40 +8,39 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <group name="config_sale" position="inside">
+                <group name="config_sale" position="after">
                     <separator string="Picking and Invoice Policy" colspan="4"/>
-                    <group colspan="4">
-                        <group colspan="2" col="2">
-                           <field name="group_invoice_so_lines"/>
-                           <field name="group_invoice_deli_orders"/>
-                           <field name="task_work" on_change="onchange_task_work(task_work)"/>
-                           <field name="module_project_timesheet" invisible="1"/>
-                           <field name="module_project_mrp" invisible="1"/>
-                           <field name="module_account_analytic_analysis"/>
-                        </group>
-                        <group colspan="2" col="2">
-                            <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)]}"/>
-                            <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
-                            <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
-                            <field name="time_unit" domain="[('category_id.name','=','Working Time')]" attrs="{'invisible':[('task_work','=',False),('module_account_analytic_analysis','=',False)],'required': [('module_account_analytic_analysis','=',True)]}"/>
-                        </group>
-                    </group>
+                    <field name="group_invoice_so_lines"/>
+                    <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)]}"/>
+                    <newline/>
+                    <field name="group_invoice_deli_orders"/>
+                    <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
+                    <newline/>
+                    <field name="task_work" on_change="onchange_task_work(task_work)"/>
+                    <field name="module_project_timesheet" invisible="1"/>
+                    <field name="module_project_mrp" invisible="1"/>
+                    <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
+                    <newline/>
+                    <field name="module_account_analytic_analysis"/>
+                    <field name="time_unit" domain="[('category_id.name','=','Working Time')]" attrs="{'invisible':[('task_work','=',False),('module_account_analytic_analysis','=',False)],'required': [('module_account_analytic_analysis','=',True)]}"/>
+
                     <separator string="Sale Order" colspan="4"/>
-                    <group colspan="2" col="2">
-                        <field name="group_sale_pricelist"/>
-                        <field name="tax_policy" on_change="onchange_tax_policy(tax_policy)"/>
-                        <field name="group_sale_taxes_global_on_order" invisible="1"/>
-                        <field name="group_sale_taxes_on_order_line" invisible="1"/>
-                        <field name="module_sale_margin"/>
-                        <field name="module_warning"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <field name="group_uom"/>
-                        <field name="group_sale_delivery_address"/>
-                        <field name="group_discount_per_so_line"/>
-                        <field name="module_sale_layout"/>
-                        <field name="module_sale_journal"/>
-                    </group>
+                    <field name="group_sale_pricelist"/>
+                    <field name="group_uom"/>
+                    <newline/>
+                    <field name="tax_policy" on_change="onchange_tax_policy(tax_policy)"/>
+                    <field name="group_sale_taxes_global_on_order" invisible="1"/>
+                    <field name="group_sale_taxes_on_order_line" invisible="1"/>
+                    <field name="group_sale_delivery_address"/>
+                    <newline/>
+                    <field name="module_sale_margin"/>
+                    <field name="group_discount_per_so_line"/>
+                    <newline/>
+                    <field name="module_warning"/>
+                    <field name="module_sale_layout"/>
+                    <newline/>
+                    <label colspan="2"/>
+                    <field name="module_sale_journal"/>
                 </group>
             </field>
         </record>