[IMP] Usability Improvements in extended group

bzr revid: vir@tinyerp.com-20100903061718-h0jptgsymym4w2sk

3 files changed, 17 insertions, 5 deletions

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index cdaf66100ac..ceeebd2e8eb 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -28,7 +28,7 @@
             <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
             <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
             <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
-            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/> <field name="misc_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
+            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)" groups="base.group_extended"/> <field name="misc_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
             <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
             <separator string="Install Specific Business Modules" colspan="4"/>
             <field name="association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index a4b4b2bda23..59543200076 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -36,10 +36,10 @@
                     <field name="currency" widget="selection"/>
                 </group>
                 <newline/>
-                <group colspan="2" groups="base.group_extended" >
-                    <field name="rml_header1" colspan="5" invisible="1"/>
-                    <field name="rml_footer1" colspan="5" invisible="1"/>
-                    <field name="rml_footer2" colspan="5" invisible="1"/>
+                <group colspan="2">
+                    <field name="rml_header1" colspan="5" invisible="1" groups="base.group_extended"/>
+                    <field name="rml_footer1" colspan="5" invisible="1" groups="base.group_extended"/>
+                    <field name="rml_footer2" colspan="5" invisible="1" groups="base.group_extended"/>
 
                     <separator colspan="4"
                                string="Your Logo - Use a size of about 450x150 pixels."/>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 2886857a45d..edfbb573911 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -104,6 +104,18 @@ class base_setup_installer(osv.osv_memory):
             return ['document_ftp']
         return None
 
+    def _if_misc_tools(self, cr, uid, ids, context=None):
+        interface = self.pool.get('res.users').browse(cr, uid, uid, context=context).view
+        if interface == 'simple' or interface =='extended' :
+            return ['lunch','idea','survey']
+        return None
+
+    def _if_account(self, cr, uid, ids, context=None):
+        if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
+               .view == 'simple':
+            return ['account_voucher']
+        return None
+
     def onchange_moduleselection(self, cr, uid, ids, *args):
         closed, total = self.get_current_progress(cr, uid)