[IMP]improve configuaration view for sale and warehouse as per review

bzr revid: sgo@tinyerp.com-20120705085125-9gtbt5h3bqmf1tar

5 files changed, 56 insertions, 74 deletions

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 161cb29b173..cbab182ecb3 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -63,15 +63,16 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <sheet>
-                        <field name="module_crm" invisible="1"/>
-                        <group name="config_sale"/>
-                        <group name="config_fetchmail_main">
-                            <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_sale">
+                                <field name="module_crm" invisible="1"/>
+                                <separator string="Emails" colspan="2"/>
+                                <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
+                                <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
+                            </group>
+                            <group name="config_other">
                             </group>
                         </group>
-                        <group name="config_crm"/>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 7120d26ac65..2bc085ac562 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -8,30 +8,25 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <group name="config_fetchmail" version="7.0" position="inside">
+                <field name="module_plugin_outlook" version="7.0" position="after">
                     <label for="fetchmail_lead"/>
                     <div>
                         <field name="fetchmail_lead"/>
                         <button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
                             attrs="{'invisible': [('fetchmail_lead','=',False)]}"/>
                     </div>
+                </field>
+                <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_fetchmail_main" version="7.0" position="inside">
-                    <group string="Import and Synchronize Data from an Other Application">
-                        <field name="module_import_sugarcrm"/>
-                        <field name="module_crm_caldav"/>
-                        <field name="module_import_google"/>
-                    </group>
-                </group>
-                <group name="config_crm" position="inside">
-                    <group>
-                        <group string="Documents and Wiki">
-                            <field name="module_wiki_sale_faq"/>
-                        </group>
-                        <group string="Customer Form">
-                            <field name="module_google_map"/>
-                        </group>
-                    </group>
+                <group name="config_sale" position="inside">
+                    <separator string="Documents and Wiki" colspan="2"/>
+                        <field name="module_wiki_sale_faq"/>
                 </group>
             </field>
         </record>
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
index c87f7b001c2..877da7304e8 100644
--- a/addons/crm_claim/res_config_view.xml
+++ b/addons/crm_claim/res_config_view.xml
@@ -9,14 +9,14 @@
             <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">
-                <group name="config_fetchmail" version="7.0" position="inside">
+                <field name="module_plugin_outlook" version="7.0" position="after">
                     <label for="fetchmail_claim"/>
                     <div>
                         <field name="fetchmail_claim"/>
                         <button type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward"
                             attrs="{'invisible': [('fetchmail_claim','=',False)]}"/>
                     </div>
-                </group>
+                </field>
             </field>
         </record>
 
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 6b737c0d632..f81a2818c38 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -11,43 +11,31 @@
                 <group name="config_sale" position="inside">
                     <field name="module_project_timesheet" invisible="1"/>
                     <field name="module_project_mrp" invisible="1"/>
-                    <group string="Invoicing Policy">
-                        <group>
-                            <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)"/>
-                        </group>
-                        <group>
-                            <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)]}"/>
-                        </group>
-                    </group>
-                    <newline/>
-                    <group string="Sale Order">
-                        <group>
-                            <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"/>
-                        </group>
-                        <group>
-                            <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>
+                    <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_fetchmail_main" position="after">
-                    <group name="group_contacts" string="Contracts">
-                        <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)]}"/>
-                    </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)]}"/>
                 </group>
             </field>
         </record>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index f5c151056f4..d5e3d6f60c5 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -15,24 +15,22 @@
                     </header>
                     <sheet>
                         <group>
-                            <group string="Traceability">
+                            <group>
+                                <separator string="Traceability" colspan="2"/>
                                 <field name="group_stock_production_lot"/>
                                 <field name="group_stock_tracking_lot"/>
                                 <field name="module_product_expiry"
                                     attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                                 <separator string="Logistics" colspan="2"/>
+                                 <field name="group_stock_multiple_locations"/>
+                                 <field name="module_stock_invoice_directly"/>
+                                 <field name="module_stock_location"/>
+                                 <field name="decimal_precision" class="oe_inline"/>
                             </group>
-                            <group string="Partners">
+                            <group>
+                                <separator string="Partners" colspan="2"/>
                                 <field name="module_claim_from_delivery"/>
-                            </group>
-                        </group>
-                        <group>
-                            <group string="Logistics">
-                                <field name="group_stock_multiple_locations"/>
-                                <field name="module_stock_invoice_directly"/>
-                                <field name="module_stock_location"/>
-                                <field name="decimal_precision" class="oe_inline"/>
-                            </group>
-                            <group string="Products">
+                                <separator string="Products" colspan="2"/>
                                 <field name="group_stock_packaging"/>
                                 <field name="group_uom"/>
                                 <field name="group_uos"/>