[IMP] crm, crm_claim, plugin_outlook, plugin_thunderbird: improve sales settings form

bzr revid: rco@openerp.com-20120622124731-u1adqcpkbwm21pso

4 files changed, 40 insertions, 30 deletions

diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index daa598de96c..38c8c2db2e4 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -8,24 +8,29 @@
             <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" position="after">
-                    <field name="fetchmail_lead"/>
-                    <group attrs="{'invisible': [('fetchmail_lead','=',False)]}">
-                    	<button colspan="2" type="object" name="configure_fetchmail_lead" string="Configure" icon="gtk-execute"/>
-                    </group>
+                <group name="config_fetchmail" version="7.0" position="inside">
+                    <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>
                 </group>
 
                 <group name="config_crm" position="after">
-                    <separator string="Import and Synchronize Data from an Other Application" colspan="4"/>
-                    <field name="module_import_sugarcrm"/>
-                    <field name="module_crm_caldav"/>
-                    <field name="module_import_google"/>
+                    <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>
 
-                    <separator string="Documents and Wiki" colspan="4"/>
-                    <field name="module_wiki_sale_faq" />
+                    <group string="Documents and Wiki">
+                        <field name="module_wiki_sale_faq"/>
+                    </group>
 
-                    <separator string="Customer Form" colspan="4"/>
-                    <field name="module_google_map"/>
+                    <group string="Customer Form">
+                        <field name="module_google_map"/>
+                    </group>
                 </group>
             </field>
         </record>
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
index 39674a1fdd1..ba9e75ba7c0 100644
--- a/addons/crm_claim/res_config_view.xml
+++ b/addons/crm_claim/res_config_view.xml
@@ -7,14 +7,15 @@
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
-            <field name="priority" eval="12"/>       <!-- to put fetchmail_lead before fetchmail_claim -->
+            <field name="priority" eval="20"/>       <!-- to put fetchmail_lead before fetchmail_claim -->
             <field name="arch" type="xml">
-                <group name="config_fetchmail" position="after">
-                   <newline/>
-                    <field name="fetchmail_claim"/>
-                    <group attrs="{'invisible': [('fetchmail_claim','=',False)]}">
-                        <button colspan="2" type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-execute"/>
-                    </group>
+                <group name="config_fetchmail" version="7.0" position="inside">
+                    <label for="fetchmail_claim"/>
+                    <div>
+                        <field name="fetchmail_claim"/>
+                        <button colspan="2" type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward"
+                            attrs="{'invisible': [('fetchmail_claim','=',False)]}"/>
+                    </div>
                 </group>
             </field>
         </record>
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index c66f90b27d9..c1e97fd7d53 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -52,11 +52,13 @@
             <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" position="after">
-                    <group colspan="2" attrs="{'invisible': ['|',('module_crm','=',False),('module_plugin_outlook','=',False)]}">
-                        <button name="%(action_outlook_installer)d" type="action"
-                            string="Configure Outlook Plugin" icon="gtk-execute"/>
-                    </group>
+                <field name="module_plugin_outlook" version="7.0" position="replace">
+                    <label for="module_plugin_outlook"/>
+                    <div>
+                        <field name="module_plugin_outlook"/>
+                        <button name="%(action_outlook_installer)d" type="action" string="Configure" icon="gtk-execute"
+                            attrs="{'invisible': [('module_plugin_outlook','=',False)]}"/>
+                    </div>
                 </field>
             </field>
         </record>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index e975b9d270a..2c8249f4899 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -56,11 +56,13 @@
             <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" position="after">
-                    <group colspan="2" attrs="{'invisible': ['|',('module_crm','=',False),('module_plugin_thunderbird','=',False)]}">
-                        <button name="%(action_thunderbird_installer)d" type="action"
-                            string="Configure Thunderbird Plugin" icon="gtk-execute"/>
-                    </group>
+                <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>
             </field>
         </record>