[IMP] All res_config files : Convert Booleans to Selection fields + radio buttons in views

2 files changed, 40 insertions, 52 deletions

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index cfed3e3218b..9976b28c352 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -80,12 +80,10 @@ class base_config_settings(osv.osv_memory):
             self.pool['ir.rule'].write(cr, uid, [partner_rule.id], {'active': not bool(wizard.company_share_partner)}, context=context)
 
 
-# Preferences wizard for Sales & CRM.
-# It is defined here because it is inherited independently in modules sale, crm.
+# Empty class but required since it's overrided by sale & crm
 class sale_config_settings(osv.osv_memory):
     _name = 'sale.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_crm': fields.boolean('CRM'),
-        'module_sale' : fields.boolean('SALE'),
     }
+
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 01410131d93..4319c834c15 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -20,15 +20,6 @@
                         </p>
                     </div>
                     <group>
-                        <label for="id" string="Options"/>
-                        <div>
-                            <div name="multi_company">
-                                <field name="module_multi_company" class="oe_inline"/>
-                                <label for="module_multi_company"/>
-                            </div>
-                        </div>
-                    </group>
-                    <group>
                         <label for="id" string="Email" name="email_label"/>
                         <div name="email">
                             <div name="email.outgoing_server">
@@ -38,7 +29,7 @@
                             </div>
                         </div>
                     </group>
-                    <group>
+                    <group groups="base.group_no_one">
                         <label for="id" string="Portal access"/>
                         <div>
                             <div>
@@ -72,30 +63,7 @@
                             </div>
                         </div>
                     </group>
-                    <group>
-                        <label for="id" string="Google Drive"/>
-                        <div name="google_drive">
-                            <div name="module_google_drive">
-                                <field name="module_google_drive" class="oe_inline"/>
-                                <label for="module_google_drive"/>
-                            </div>
-                        </div>
-                    </group>
-                    <group name="google_analytics">
-                        <label for="id" string="Google Calendar"/>
-                        <div name="google_calendar">
-                            <div name="module_google_calendar">
-                                <field name="module_google_calendar" class="oe_inline"/>
-                                <label for="module_google_calendar"/>
-                                    <div name="google_calendar_config_description" attrs="{'invisible': [('module_google_calendar','=',False)]}">
-                                        <p>
-                                            Once installed, you can configure your API credentials for "Google calendar"
-                                        </p>
-                                    </div>
-                                </div>
-                        </div>
-                    </group>
-                    <group>
+                    <group groups="base.group_no_one">
                         <label for="font" />
                         <div>
                             <div>
@@ -105,6 +73,15 @@
                         </div>
                     </group>
                     <group>
+                        <label for="id" string="Multi Company"/>
+                        <div>
+                            <div name="multi_company">
+                                <field name="module_multi_company" class="oe_inline"/>
+                                <label for="module_multi_company"/>
+                            </div>
+                        </div>
+                    </group>
+                    <group attrs="{'invisible': [('module_multi_company','=',False)]}">
                         <label for="module_inter_company_rules" string="Inter company"/>
                         <div name="inter_company">
                             <div name="module_inter_company_rules">
@@ -113,7 +90,7 @@
                             </div>
                         </div>
                     </group>
-                    <group string="Shared ressources" name="company_share_ressources">
+                    <group string="Shared ressources" name="company_share_ressources" attrs="{'invisible': [('module_multi_company','=',False)]}">
                         <label for="company_share_partner" />
                         <div>
                             <div>
@@ -121,6 +98,30 @@
                             </div>
                         </div>
                     </group>
+                    <separator string="Google Integration" name="google"/>
+                    <group>
+                        <label for="id" string="Google Drive"/>
+                        <div name="google_drive">
+                            <div name="module_google_drive">
+                                <field name="module_google_drive" class="oe_inline"/>
+                                <label for="module_google_drive"/>
+                            </div>
+                        </div>
+                    </group>
+                    <group name="google_analytics">
+                        <label for="id" string="Google Calendar"/>
+                        <div name="google_calendar">
+                            <div name="module_google_calendar">
+                                <field name="module_google_calendar" class="oe_inline"/>
+                                <label for="module_google_calendar"/>
+                                    <div name="google_calendar_config_description" attrs="{'invisible': [('module_google_calendar','=',False)]}">
+                                        <p>
+                                            Once installed, you can configure your API credentials for "Google calendar"
+                                        </p>
+                                    </div>
+                                </div>
+                        </div>
+                    </group>
                 </form>
             </field>
         </record>
@@ -145,20 +146,9 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <div name="customer feature" attrs="{'invisible': [('module_sale','=',False)]}">
-                        <field name="module_sale" invisible="1"/>
-                        <separator string="Quotations and Sales Orders"/>
-                        <group name="Customer">
-                            <label for="id" string="Customer Features"/>
-                            <div name="Customer Features"/>
-                        </group>
-                        <group name="Sale">
-                            <label for="id" string="Sale Features"/>
-                            <div name="Sale Features"/>
-                        </group>
+                    <div id="main">
+
                     </div>
-                    <div name="config_sale"/>
-                    <div name="config_pos"/>
                 </form>
             </field>
         </record>