[IMP]profile_tools :Remove Extra Tools Configuration Wiz and inherit it to INstall Appl wiz

bzr revid: aag@tinyerp.co.in-20110502114434-3sn3y8n2qvqyolyi

2 files changed, 14 insertions, 44 deletions

diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
index 6f68b63cc02..44258234d11 100644
--- a/addons/profile_tools/installer.py
+++ b/addons/profile_tools/installer.py
@@ -21,8 +21,7 @@
 from osv import fields, osv
 
 class misc_tools_installer(osv.osv_memory):
-    _name = 'misc_tools.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         'lunch':fields.boolean('Lunch',help='A simple module to help you to manage Lunch orders.'),
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index d1bfcd259c4..2513e9e7937 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -2,54 +2,25 @@
   <data>
     <record id="view_misc_tools_installer" model="ir.ui.view">
       <field name="name">misc_tools.installer.view</field>
-      <field name="model">misc_tools.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes">
-            <attribute name="string">Extra Tools Configuration</attribute>
-          </form>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                <attribute name='string'></attribute>
+          <xpath expr="//field[@name='product_expiry']" position="after">
+            <newline/>
+            <group attrs="{'invisible': [('profile_tools', '=', False)]}" colspan="4">
+                <separator  string="Extra Tools Details" colspan="4" />
+            </group>
+                <field name="share" attrs="{'invisible': [('profile_tools', '=', False)]}"/>
+                <field name="lunch" attrs="{'invisible': [('profile_tools', '=', False)]}"/>
+                <field name="idea" attrs="{'invisible': [('profile_tools', '=', False)]}"/>
+                <field name="survey" attrs="{'invisible': [('profile_tools', '=', False)]}"/>
+                <field name="subscription" groups="base.group_extended" attrs="{'invisible': [('profile_tools', '=', False)]}"/>
+                <field name="pad" attrs="{'invisible': [('profile_tools', '=', False)]}"/>            
           </xpath>
-
-          <separator string="title" position="attributes">
-            <attribute name="string">Configure Extra Tools</attribute>
-          </separator>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Extra Tools are applications that can help you improve your organization although they are not key for company management.</attribute>
-          </xpath>
-          <xpath expr="//button[@string='Install Modules']" position="attributes">
-              <attribute name="string">Configure</attribute>
-          </xpath>
-          <group colspan="8">
-            <field name="share"/>
-            <field name="lunch"/>
-            <field name="idea"/>
-            <field name="survey"/>
-            <field name="subscription" groups="base.group_extended"/>
-            <field name="pad"/>
-          </group>
         </data>
       </field>
     </record>
-
-    <record id="action_misc_tools_installer" model="ir.actions.act_window">
-      <field name="name">Tools Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">misc_tools.installer</field>
-      <field name="view_id" ref="view_misc_tools_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="misc_tools_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_misc_tools_installer"/>
-        <field name="type">special</field>
-      <field name="sequence">3</field>
-    </record>
   </data>
 </openerp>