diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index 6ec78163d92..12814561d95 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -616,7 +616,6 @@
 		<record id="action_wizard_multi_chart_todo" model="ir.actions.todo">
 			<field name="name">Generate Chart of Accounts from a Chart Template</field>
 			<field name="action_id" ref="account.action_wizard_multi_chart"/>
-			<field name="state">open</field>
 			<field name="type">special</field>
 		</record>
 
diff --git a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
index 6a07ae8c9e7..0c90b8597c9 100644
--- a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
@@ -13,7 +13,8 @@
     <record id="account_analytic_plan_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="account_analytic_plan_form_action_installer"/>
         <field name="sequence">15</field>
-        <field name="type">normal_recurring</field>
+        <field name="type">normal</field>
+        <field name="state">skip</field>
     </record>
 
   </data>
diff --git a/addons/account_sequence/account_sequence_installer_view.xml b/addons/account_sequence/account_sequence_installer_view.xml
index a1fce67e4b1..c494f9c3168 100644
--- a/addons/account_sequence/account_sequence_installer_view.xml
+++ b/addons/account_sequence/account_sequence_installer_view.xml
@@ -51,6 +51,7 @@
       <field name="action_id" ref="action_account_seq_installer"/>
       <field name="sequence">3</field>
       <field name="type">special</field>
+      <field name="state">skip</field>
     </record>
 
   </data>
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 3181ac32a78..bc155733595 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -50,7 +50,7 @@
             id="config_install_module">
             <field name="action_id" ref="action_config_install_module"/>
             <field name="sequence">3</field>
-            <field name="type">normal_recurring</field>
+            <field name="type">special</field>
       </record>
 
         <menuitem
diff --git a/addons/base_contact/base_contact_installer_view.xml b/addons/base_contact/base_contact_installer_view.xml
index 672c43745fb..abb460de183 100644
--- a/addons/base_contact/base_contact_installer_view.xml
+++ b/addons/base_contact/base_contact_installer_view.xml
@@ -53,6 +53,7 @@
             <field name="action_id" ref="action_base_contact_installer"/>
             <field name="sequence">3</field>
             <field name="state">skip</field>
+            <field name="type">special</field>
         </record>
 
     </data>
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 3299e49a6c1..dc472e8b3b9 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -57,7 +57,7 @@
     <record id="report_designer_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_report_designer_installer"/>
         <field name="sequence">3</field>
-        <field name="type">normal_recurring</field>
+        <field name="type">special</field>
     </record>
 
     <record id="action_report_designer_wizard" model="ir.actions.act_window">
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 65665af9a52..d5e9b94c8b6 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -112,6 +112,7 @@
    <record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_migrade_application_installer_modules"/>
       <field name="type">normal</field>
+      <field name="state">skip</field>
   </record>
   
           <!-- Import or create customers configartion view  -->
@@ -160,7 +161,7 @@
     <!--          register configuration wizard -->
 	<record id="config_wizard_res_product_installer" model="ir.actions.todo">
 	    <field name="action_id" ref="action_import_create_installer"/>
-	    <field name="type">normal_recurring</field>
+	    <field name="type">normal</field>
 	    <field name="state">skip</field>
 	</record>
 	
@@ -214,6 +215,7 @@
       <record id="config_action_user_preferences_config_form" model="ir.actions.todo">
           <field name="action_id" ref="action_user_preferences_config_form"/>
           <field name="type">normal</field>
+          <field name="state">skip</field>
       </record>
       
       <!--     Config Wiz   Give access to others users   -->
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 4de276fdce2..0309318aea0 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -120,35 +120,27 @@ class base_setup_installer(osv.osv_memory):
     def execute(self, cr, uid, ids, context=None):
         if context is None:
              context = {}
-        modules = self.pool.get('ir.module.module')
+        module_pool = self.pool.get('ir.module.module')
         modules_selected = []
         datas = self.read(cr, uid, ids, context=context)[0]
-        key = datas.keys()
-        key.remove("id")
-        key.remove("progress")
-        name_list = []
-        for mod in key:
+        for mod in datas.keys():
+            if mod in ('id', 'progress'):
+                continue
             if datas[mod] == 1:
                 modules_selected.append(mod)
-        inst = modules.browse(
-            cr, uid,
-            modules.search(cr, uid,
-                           [('name','in',modules_selected)
-                            ],
-                           context=context),
-            context=context)
-        for i in inst:
-            if i.state == 'uninstalled':
-                sect_mod_id = i.id
-                modules.state_update(cr, uid, [sect_mod_id], 'to install', ['uninstalled'], context)
+
+        module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context)
+        for module in module_pool.browse(cr, uid, module_ids, context=context):
+            if module.state == 'uninstalled':
+                module_pool.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
                 cr.commit()
                 new_db, self.pool = pooler.restart_pool(cr.dbname, update_module=True)
-            elif i.state == 'installed':
-                if modules_selected:
-                    for instl in modules_selected:
-                        cr.execute("update ir_actions_todo set state='open' from ir_model_data as data where data.res_id = ir_actions_todo.id and data.model =  'ir.actions.todo' and data.module  like '%"+instl+"%'")
-        
-        return 
+            elif module.state == 'installed':
+                cr.execute("update ir_actions_todo set state='open' \
+                                    from ir_model_data as data where data.res_id = ir_actions_todo.id \
+                                    and ir_actions_todo.type='special'\
+                                    and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
+        return
     
 base_setup_installer()
 
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index db6930b8259..7b7717a1fe1 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -77,7 +77,7 @@
     <record id="crm_case_section_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="crm_case_section_view_form_installer"/>
         <field name="sequence">10</field>
-        <field name="type">normal_recurring</field>
+        <field name="type">special</field>
     </record>
 
     <record model="ir.actions.act_window" id="crm_case_stage_form_installer">
@@ -92,7 +92,7 @@
     <record id="crm_case_stage_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="crm_case_stage_form_installer"/>
         <field name="sequence">10</field>
-        <field name="type">normal_recurring</field>
+        <field name="type">special</field>
     </record>
 
   </data>
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index bdbaf410499..21855b21ede 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -45,8 +45,7 @@
     <record model="ir.actions.todo" id="config_auto_directory">
         <field name="action_id" ref="action_config_auto_directory"/>
         <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
-        <field name="state" eval="'skip'" />
-        <field name="type" eval="'special'" />
+        <field name="type">special</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/document_ics/document_ics_config_wizard.xml b/addons/document_ics/document_ics_config_wizard.xml
index 5767e4ee74d..3fa239654be 100644
--- a/addons/document_ics/document_ics_config_wizard.xml
+++ b/addons/document_ics/document_ics_config_wizard.xml
@@ -56,6 +56,7 @@
         <record id="config_wizard_step_case_section_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_view_document_ics_config_directories"/>
             <field name="type">special</field>
+            <field name="state">skip</field>
         </record>
      </data>
 </openerp>
diff --git a/addons/fetchmail/fetchmail_installer_view.xml b/addons/fetchmail/fetchmail_installer_view.xml
index 28c266dbc5e..f478a481cdf 100644
--- a/addons/fetchmail/fetchmail_installer_view.xml
+++ b/addons/fetchmail/fetchmail_installer_view.xml
@@ -13,7 +13,8 @@
 	    <record id="view_email_server_form_installer_todo" model="ir.actions.todo">
 	        <field name="action_id" ref="view_email_server_form_installer"/>
 	        <field name="sequence">4</field>
-	        <field name="type">normal_recurring</field>
+	        <field name="type">normal</field>
+	        <field name="state">skip</field>
 	    </record>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index f68b13ed54e..60bf243300a 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -52,7 +52,7 @@
     <record id="hr_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_hr_installer"/>
       <field name="sequence">3</field>
-            <field name="type">special</field>
+      <field name="type">special</field>
     </record>
 
          <record model="ir.actions.act_window" id="view_employee_form_installer">
@@ -67,7 +67,8 @@
        <record id="view_employee_form_todo" model="ir.actions.todo">
            <field name="action_id" ref="view_employee_form_installer"/>
            <field name="sequence">3</field>
-           <field name="type">normal_recurring</field>
+           <field name="type">normal</field>
+           <field name="state">skip</field>
        </record>
 
 
diff --git a/addons/hr_evaluation/hr_evaluation_installer_view.xml b/addons/hr_evaluation/hr_evaluation_installer_view.xml
index f7e8ecd45bd..5b2e149b8d2 100644
--- a/addons/hr_evaluation/hr_evaluation_installer_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_installer_view.xml
@@ -13,7 +13,8 @@
        <record id="view_department_form_todo" model="ir.actions.todo">
            <field name="action_id" ref="view_department_form_installer"/>
            <field name="sequence">3</field>
-           <field name="type">normal_recurring</field>
+           <field name="type">normal</field>
+           <field name="state">skip</field>
        </record>
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index 2cbdb5d9bf2..5db69bc0a98 100644
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -14,7 +14,8 @@
        <record id="product_normal_form_view_todo" model="ir.actions.todo">
            <field name="action_id" ref="product_normal_form_view_installer"/>
            <field name="sequence">3</field>
-           <field name="type">normal_recurring</field>
+           <field name="type">normal</field>
+           <field name="state">skip</field>
        </record>
     </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_installer_view.xml b/addons/hr_recruitment/hr_recruitment_installer_view.xml
index ca09ad8abe4..f3367c5de8f 100644
--- a/addons/hr_recruitment/hr_recruitment_installer_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_installer_view.xml
@@ -13,7 +13,8 @@
        <record id="hr_recruitment_stage_form_todo" model="ir.actions.todo">
            <field name="action_id" ref="hr_recruitment_stage_form_installer"/>
            <field name="sequence">3</field>
-           <field name="type">normal_recurring</field>
+           <field name="type">normal</field>
+           <field name="state">skip</field>
        </record>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
index f09344dec37..cd2bb285f03 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
@@ -41,6 +41,7 @@
 	        <field name="action_id" ref="action_hr_timesheet_invoice_wizard"/>
 	        <field name="sequence">3</field>
 	        <field name="type">normal</field>
+	        <field name="state">skip</field>
     </record>
 
     </data>
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index a8c458a1fe1..1366a211e92 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -53,7 +53,7 @@
       <field name="action_id" ref="action_knowledge_installer"/>
       <field name="sequence">3</field>
       <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
-            <field name="type">special</field>
+      <field name="type">special</field>
     </record>
 
   </data>
diff --git a/addons/lunch/lunch_installer_view.xml b/addons/lunch/lunch_installer_view.xml
index d6bce31e80c..03f6492e732 100644
--- a/addons/lunch/lunch_installer_view.xml
+++ b/addons/lunch/lunch_installer_view.xml
@@ -13,7 +13,8 @@
        <record id="view_lunch_product_form_todo" model="ir.actions.todo">
            <field name="action_id" ref="view_lunch_product_form_installer"/>
            <field name="sequence">50</field>
-           <field name="type">normal_recurring</field>
+           <field name="type">normal</field>
+           <field name="state">skip</field>
        </record>
     </data>
 </openerp>
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 4b6b282527e..7acc9806a63 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -58,7 +58,7 @@
         <record id="marketing_installer_todo" model="ir.actions.todo">
             <field name="action_id" ref="action_marketing_installer"/>
             <field name="sequence">3</field>
-            <field name="type">normal_recurring</field>
+            <field name="type">special</field>
         </record>
 
     </data>
diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml
index 07df3a1cd0e..e4d120e9c37 100644
--- a/addons/outlook/outlook_installer.xml
+++ b/addons/outlook/outlook_installer.xml
@@ -61,6 +61,7 @@
         <record id="outlook_installer_todo" model="ir.actions.todo">
             <field name="action_id" ref="action_outlook_installer"/>
             <field name="type">normal</field>
+            <field name="state">skip</field>
             <field name="sequence">4</field>
         </record>
 
diff --git a/addons/product/wizard/product_installer.xml b/addons/product/wizard/product_installer.xml
index 67c52780bae..7f3ed52a384 100644
--- a/addons/product/wizard/product_installer.xml
+++ b/addons/product/wizard/product_installer.xml
@@ -15,7 +15,7 @@
         <record id="config_wizard_res_product_installer" model="ir.actions.todo">
             <field name="action_id" ref="product_form_config_action"/>
             <field name="target">current</field>
-            <field name="type">normal_recurring</field>
+            <field name="type">normal</field>
             <field name="sequence">20</field>
             <field name="state">skip</field>
         </record>
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index 93dadad007f..7c6864a8d5b 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -46,6 +46,7 @@
     <record id="purchase_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_purchase_install_module"/>
       <field name="sequence">3</field>
+      <field name="type">special</field>
       <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
     </record>
     </data>
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index b3eb4f84574..65a93a4a658 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -44,7 +44,8 @@
         <!-- register configuration wizard -->
         <record id="config_wizard_step_purchase_limit_amount" model="ir.actions.todo">
             <field name="action_id" ref="action_config_purchase_limit_amount"/>
-            <field name="type">special</field>
+            <field name="type">normal</field>
+            <field name="state">skip</field>
         </record>
         
     </data>
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index d3416162ab8..fc720c8d466 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -45,7 +45,8 @@
 
     <record id="report_designer_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_report_designer_installer"/>
-      <field name="type">special</field>
+      <field name="type">normal</field>
+      <field name="state">skip</field>
       <field name="sequence">3</field>
     </record>
   </data>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c6917b1583a..2024bac8dda 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -574,7 +574,7 @@
         <!-- register configuration wizard -->
         <record id="config_wizard_step_sale_picking_policy" model="ir.actions.todo">
             <field name="action_id" ref="action_config_picking_policy"/>
-            <field name="type">normal</field>
+            <field name="type">special</field>
             <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
         </record>
 
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index 3997b95f486..2b1fc095f5e 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -62,6 +62,7 @@
     <record id="thunderbird_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_thunderbird_installer"/>
         <field name="type">normal</field>
+        <field name="state">skip</field>
         <field name="sequence">3</field>
     </record>