From 8895562fffc7a409d4b3c054a6f418cde67b9c98 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 17 Jul 2012 17:03:04 +0530
Subject: [PATCH] [IMP] improve layout of sales config wizard

bzr revid: fka@tinyerp.com-20120717113304-0mg50z82ia2qznq6
---
 addons/base_setup/res_config_view.xml         |  24 ++--
 addons/crm/res_config_view.xml                |  55 +++++++---
 addons/crm_claim/res_config_view.xml          |  12 +-
 addons/plugin_outlook/plugin_outlook.xml      |  12 +-
 .../plugin_thunderbird/plugin_thunderbird.xml |  14 +--
 addons/sale/res_config_view.xml               | 103 +++++++++++++-----
 6 files changed, 149 insertions(+), 71 deletions(-)

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 5227b0885a9..c3ebab6da4e 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -30,7 +30,6 @@
                             <button type="action" name="%(base.action_ir_mail_server_list)d"
                             string="Configure" icon="gtk-execute"/>
                         </group>
-                        
                     </group>
                 </form>
             </field>
@@ -51,22 +50,29 @@
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Sales" version="7.0">
+                <form string="Configure Sales" version="7.0" class="oe_form_configuration">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                        <group>
-                            <group name="config_sale">
+                            <group name="config_sale" col="1">
                                 <field name="module_crm" invisible="1"/>
-                                <separator string="Emails" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                                <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                                <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
+                                <separator string="Emails Integration" col="1" attrs="{'invisible': [('module_crm','=',False)]}"/>
+                                <div>The email integration allows ypu to autometically create leads or others documents from an incoming emails account.
+                                    Users can do it from the mail client by pressing a button or it can be configured to automatically synchronize from your mail server.</div>
+                                <group name="On Mail Client"><label for="id" string="On Mail Client"/>
+                                <div>
+                                    <div name="module_plugin_thunderbird"><field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}" class="oe_inline"/>
+                                    <label for="module_plugin_thunderbird"/></div>
+                                    <div name="module_plugin_outlook"><field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}" class="oe_inline"/>
+                                    <label for="module_plugin_outlook"/></div>
+                                </div>
+                                </group>
                             </group>
-                            <group name="config_other">
+                            <group name="config_other" col="1">
                             </group>
-                        </group>
+                        
                 </form>
             </field>
         </record>
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 96fa16eaa2d..dc6a8c7d94d 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -8,28 +8,55 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <separator string="Emails" version="7.0" position="after">
-                    <label for="fetchmail_lead"/>
+                <group name="On Mail Client" version="7.0" position="after">
+                    <group>
+                    <label for="id" string="On Mail Server"/>
                     <div>
-                        <field name="fetchmail_lead"/>
+                        <div name="fetchmail_lead"><field name="fetchmail_lead" class="oe_inline"/>
+                        <label for="fetchmail_lead"/>
                         <button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
-                            attrs="{'invisible': [('fetchmail_lead','=',False)]}"/>
+                            attrs="{'invisible': [('fetchmail_lead','=',False)]}" class="oe_link"/>
+                        </div>
                     </div>
-                </separator>
+                    </group>
+                </group>
                 <group name="config_other" version="7.0" position="inside">
                     <separator string="Import and Synchronize Data from an Other Application" colspan="2"/>
-                    <field name="module_import_sugarcrm"/>
-                    <field name="module_crm_caldav"/>
-                    <field name="module_import_google"/>
-                    <separator string="Customer Form" colspan="2"/>
-                    <field name="module_google_map"/>
-                </group>
-                <group name="config_sale" position="inside">
-                    <separator string="Documents and Wiki" colspan="2"/>
-                        <field name="module_wiki_sale_faq"/>
+                    <group>
+                    <label for="id" string="Import From"/>
+                    <div>
+                        <div><field name="module_import_sugarcrm"/>
+                        <label for="module_import_sugarcrm" string="SugarCRM"/></div>
+                    </div>
+                    </group>
+                    <group>
+                    <label for="id" string="Synchronize with"/>
+                    <div>
+                    <div><field name="module_import_google"/>
+                    <label for="module_import_google" string="Google (Contact and Calendar)"/></div>
+                    <div><field name="module_crm_caldav"/>
+                    <label for="module_crm_caldav" string="Application with Caldav protocol"/></div>
+                    </div>
+                    </group>
                 </group>
             </field>
         </record>
+        <record id="view_config_sale" model="ir.ui.view">
+            <field name="name">Sales Application</field>
+            <field name="model">sale.config.settings</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sale.view_sales_config"/>
+            <field name="arch" type="xml">
+                <div name="module_sale_journal" version="7.0" position="after">
+                     <div><field name="module_google_map"/>
+                    <label for="module_google_map" string="Add google maps on customer"/></div>
+                </div>
+                <div name="module_sale_margin" version="7.0" position="after">
+                    <div><field name="module_wiki_sale_faq"/>
+                        <label for="module_wiki_sale_faq" string="Share information with sales FAQ"/></div>
+                </div>
+            </field>
+        </record>
 
         <menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config"
             sequence="1" action="base_setup.action_sale_config"/>
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
index 327bf144544..bdcec2df43c 100644
--- a/addons/crm_claim/res_config_view.xml
+++ b/addons/crm_claim/res_config_view.xml
@@ -9,14 +9,12 @@
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="priority" eval="20"/>       <!-- to put fetchmail_lead before fetchmail_claim -->
             <field name="arch" type="xml">
-                <separator string="Emails" version="7.0" position="after">
-                    <label for="fetchmail_claim"/>
-                    <div>
-                        <field name="fetchmail_claim"/>
+               <div name="fetchmail_lead" position="after">
+                        <div><field name="fetchmail_claim" class="oe_inline"/>
+                        <label for="fetchmail_claim"/>
                         <button type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward"
-                            attrs="{'invisible': [('fetchmail_claim','=',False)]}"/>
-                    </div>
-                </separator>
+                            attrs="{'invisible': [('fetchmail_claim','=',False)]}" class="oe_link"/></div>
+                </div>
             </field>
         </record>
 
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 0340a7c502f..428c7f2a649 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -52,14 +52,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <field name="module_plugin_outlook" version="7.0" position="replace">
-                    <label for="module_plugin_outlook"/>
-                    <div>
-                        <field name="module_plugin_outlook"/>
+                <div name="module_plugin_outlook" version="7.0" position="replace">
+                        <div><field name="module_plugin_outlook" class="oe_inline"/>
+                        <label for="module_plugin_outlook"/>
                         <button name="%(action_outlook_installer)d" type="action" string="Configure" icon="gtk-execute"
-                            attrs="{'invisible': [('module_plugin_outlook','=',False)]}"/>
-                    </div>
-                </field>
+                            attrs="{'invisible': [('module_plugin_outlook','=',False)]}" class="oe_link"/></div>
+                </div>
             </field>
         </record>
 
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index fef7772dfdf..5be79c069ff 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -58,14 +58,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <field name="module_plugin_thunderbird" version="7.0" position="replace">
-                    <label for="module_plugin_thunderbird"/>
-                    <div>
-                        <field name="module_plugin_thunderbird"/>
-                        <button name="%(action_thunderbird_installer)d" type="action" string="Configure" icon="gtk-execute"
-                            attrs="{'invisible': [('module_plugin_thunderbird','=',False)]}"/>
-                    </div>
-                </field>
+                <div name="module_plugin_thunderbird" version="7.0" position="replace">
+                        <div><field name="module_plugin_thunderbird" class="oe_inline"/>
+                        <label for="module_plugin_thunderbird"/>
+                        <button name="%(action_thunderbird_installer)d" type="action" string="Download and install the plugin" icon="gtk-execute"
+                            attrs="{'invisible': [('module_plugin_thunderbird','=',False)]}" class="oe_link"/></div>
+                </div>
             </field>
         </record>
 
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 74796bac6fc..8bead1c4411 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -8,34 +8,85 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <group name="config_sale" position="inside">
+                <group name="config_sale" position="before">
+                    <div>
+                    <separator string="Invoicing Process"/>
+                    <group>
+                        <label for="id" string="Invoicing Process"/>
+                        <div>
+                            <div><field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>
+                            <label for="group_invoice_so_lines" string="genrate invoices based on the sale order"/></div>
+                            <div><field name="group_invoice_deli_orders" class="oe_inline" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+                            <label for="group_invoice_deli_orders" string="genrate invoices after and based on delivery orders"/></div>
+                            <div><field name="task_work" class="oe_inline" on_change="onchange_task_work(task_work)"/>
+                            <label for="task_work" string="prepare invoices based on task's activities"/></div>
+                            <div><field name="timesheet" class="oe_inline" on_change="onchange_timesheet(timesheet)"/>
+                            <label for="timesheet" string="prepare invoices based on timesheets"/></div>
+                        </div>    
+                    </group> 
+                    <group>
+                        <label for="id" string="Default Process"/>
+                        <div>
+                            <div attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}">
+                                <field name="default_order_policy" string="the default invocing method is" />
+                            </div>
+                            <div attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"><field name="module_delivery" class="oe_inline"/>
+                            <label for="module_delivery" string="allow adding shipping cost"/></div>
+                            <div attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"><field name="time_unit" string="the default working time unit for service is " domain="[('category_id.name','=','Working Time')]"/>
+                            </div>
+                        </div>
+                    </group>
+                    </div>
+                
                     <field name="module_project_timesheet" invisible="1"/>
                     <field name="module_project_mrp" invisible="1"/>
-                    <separator string="Sale Order" colspan="2"/>
-                    <field name="group_uom"/>
-                    <field name="group_sale_delivery_address"/>
-                    <field name="group_sale_pricelist"/>
-                    <field name="group_multiple_shops"/>
-                    <field name="module_warning"/>
-                    <field name="decimal_precision"/>
-                    <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
-                    <field name="group_discount_per_so_line"/>
-                    <field name="module_sale_margin"/>
-                    <field name="module_sale_journal"/>
-                </group>
-                <group name="config_other" position="inside">
-                    <separator string="Invoicing Policy" colspan="2" />
-                    <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                    <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                    <field name="task_work" on_change="onchange_task_work(task_work)"/>
-                    <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
-                    <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
-                    <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('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': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
-                    <separator string="Contracts" colspan="2"/>
-                    <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
-                    <field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
+                    <separator string="Quotations and Sales Orders" col="1"/>
+                    <group>
+                        <label for="id" string="Customer Features"/>
+                        <div>
+                            <div><field name="group_sale_delivery_address" class="oe_inline"/>
+                            <label for="group_sale_delivery_address"/></div>
+                            <div><field name="group_sale_pricelist" class="oe_inline"/>
+                            <label for="group_sale_pricelist" string="use pricelists to adapt your price per customers"/></div>
+                            <div><field name="module_warning" class="oe_inline"/>
+                            <label for="module_warning" string="allow configuring alert by customer or products"/></div>
+                            <div name="module_sale_journal"><field name="module_sale_journal" class="oe_inline"/>
+                            <label for="module_sale_journal" string="allow batch invoicing through journals"/></div>
+                        </div>
+                    </group>
+                    <group>
+                        <label for="id" string="Product Features"/>
+                        <div>
+                            <div><field name="group_uom" class="oe_inline"/>
+                            <label for="group_uom" /></div>
+                            <div><field name="group_discount_per_so_line" class="oe_inline"/>
+                            <label for="group_discount_per_so_line" string="Allow setting a discount on the sale order lines" /></div>
+                            <div><label for="decimal_precision" string="What's the decimal precision on prices:"/>
+                            <field name="decimal_precision" class="oe_inline"/></div>
+                        </div>
+                    </group>
+                    <group>
+                        <label for="id" string="Sale Features"/>
+                        <div>
+                            <div><field name="group_multiple_shops" class="oe_inline"/>
+                            <label for="group_multiple_shops" /></div>
+                            <div attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"><field name="default_picking_policy" class="oe_inline"/>
+                            <label for="default_picking_policy" /></div>
+                            <div name="module_sale_margin"><field name="module_sale_margin" class="oe_inline"/>
+                            <label for="module_sale_margin" /></div>
+                        </div>
+                    </group>
+                    <separator string="Contracts Management" colspan="2"/>
+                    <div>Use contract to be able to manage your services with multiple invoicing as part of the same contract with your customer</div>
+                    <group>
+                        <label for="id" string="Contract Feature"/>
+                        <div>
+                            <div><field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)" class="oe_inline"/>
+                            <label for="module_account_analytic_analysis" string="Use contract management"/></div>
+                            <div attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"><field name="module_analytic_user_function" class="oe_inline"/>
+                            <label for="module_analytic_user_function"/></div>
+                        </div>
+                    </group>
                 </group>
             </field>
         </record>