diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 6ebdf74b977..7e3836340b9 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -116,13 +116,13 @@
         <record id="account_configuration_installer_todo" model="ir.actions.todo">
             <field name="action_id" ref="action_account_configuration_installer"/>
             <field name="sequence">3</field>
-            <field name="restart">onskip</field>
+            <field name="restart">on_trigger</field>
         </record>
 
         <record id="account_installer_todo" model="ir.actions.todo">
             <field name="action_id" ref="action_account_installer"/>
             <field name="sequence">5</field>
-            <field name="restart">always</field>
+            <field name="restart">on_trigger</field>
             <field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
         </record>
 
diff --git a/addons/account_sequence/account_sequence_installer_view.xml b/addons/account_sequence/account_sequence_installer_view.xml
index 1051b133045..3a812a187c4 100644
--- a/addons/account_sequence/account_sequence_installer_view.xml
+++ b/addons/account_sequence/account_sequence_installer_view.xml
@@ -50,7 +50,7 @@
     <record id="account_seq_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_account_seq_installer"/>
       <field name="sequence">3</field>
-      <field name="restart">onskip</field>
+      <field name="restart">on_trigger</field>
     </record>
 
   </data>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 7cd0563aafe..c3a1bc24a8b 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -67,7 +67,7 @@
     <record id="base_setup_company_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_company"/>
         <field name="sequence">1</field>
-        <field name="restart">onskip</field>
+        <field name="restart">on_trigger</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index e23f1171752..bb2626a59ae 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 from osv import fields, osv
+import re
 
 class base_setup_installer(osv.osv_memory):
     _name = 'base.setup.installer'
@@ -101,5 +102,37 @@ class base_setup_installer(osv.osv_memory):
         value.update({'progress':progress})
         if progress < 10.:
             progress = 10.
+        
         return {'value':value}
+    
+    def execute(self, cr, uid, ids, context=None):
+        if context is None:
+             context = {}
+        modules = 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:
+            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.button_install(cr, uid, [sect_mod_id], context=context)
+            elif i.state == 'installed':
+                if modules_selected:
+                    for instl in modules_selected:
+                        cr.execute("update ir_actions_todo set restart='on_trigger' , 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 
 base_setup_installer()
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 35ff5a0a7cc..778ebd5646a 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -61,7 +61,7 @@
     <record id="crm_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_crm_installer"/>
         <field name="sequence">3</field>
-        <field name="restart">always</field>
+        <field name="restart">on_trigger</field>
         <field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
     </record>
   </data>
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index 156af432b0e..8aa874782b9 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -46,7 +46,7 @@
         <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="restart" eval="'onskip'" />
+        <field name="restart" eval="'on_trigger'" />
     </record>
   </data>
 </openerp>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 5ccbaefa3f5..3d04abf00e3 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="restart">always</field>
+            <field name="restart">on_trigger</field>
     </record>
 
   </data>
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 068fa9b413b..79f6cfb178e 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="restart">always</field>
+            <field name="restart">on_trigger</field>
     </record>
 
   </data>
diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml
index 0e691260425..5b3c42b22fa 100644
--- a/addons/l10n_be/l10n_be_wizard.xml
+++ b/addons/l10n_be/l10n_be_wizard.xml
@@ -4,7 +4,7 @@
 
     <record id="config_call_account_template" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="restart">onskip</field>
+        <field name="restart">on_trigger</field>
     </record>
 
     </data>
diff --git a/addons/l10n_br/data/l10n_br_account_chart_template.xml b/addons/l10n_br/data/l10n_br_account_chart_template.xml
index dd714bacab8..4b548f65c8c 100644
--- a/addons/l10n_br/data/l10n_br_account_chart_template.xml
+++ b/addons/l10n_br/data/l10n_br_account_chart_template.xml
@@ -19,7 +19,7 @@
     This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/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="restart">onskip</field>
+            <field name="restart">on_trigger</field>
         </record>
 	
 	</data>
diff --git a/addons/l10n_cr/l10n_wizard.xml b/addons/l10n_cr/l10n_wizard.xml
index 0e691260425..5b3c42b22fa 100644
--- a/addons/l10n_cr/l10n_wizard.xml
+++ b/addons/l10n_cr/l10n_wizard.xml
@@ -4,7 +4,7 @@
 
     <record id="config_call_account_template" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="restart">onskip</field>
+        <field name="restart">on_trigger</field>
     </record>
 
     </data>
diff --git a/addons/l10n_es/l10n_es_wizard.xml b/addons/l10n_es/l10n_es_wizard.xml
index 294f0a5e668..3bbda51e00c 100644
--- a/addons/l10n_es/l10n_es_wizard.xml
+++ b/addons/l10n_es/l10n_es_wizard.xml
@@ -4,7 +4,7 @@
 
         <record id="config_call_account_template" model="ir.actions.todo">
             <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="restart">onskip</field>
+            <field name="restart">on_trigger</field>
         </record>
 
     </data>
diff --git a/addons/l10n_fr/l10n_fr_wizard.xml b/addons/l10n_fr/l10n_fr_wizard.xml
index 985c3b81195..48147ac172d 100644
--- a/addons/l10n_fr/l10n_fr_wizard.xml
+++ b/addons/l10n_fr/l10n_fr_wizard.xml
@@ -4,7 +4,7 @@
 
     <record id="config_call_account_template_fr" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="restart">onskip</field>
+        <field name="restart">on_trigger</field>
     </record>
 
     </data>
diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml
index f0655f3dc99..5942e7800d0 100644
--- a/addons/l10n_lu/l10n_lu_wizard.xml
+++ b/addons/l10n_lu/l10n_lu_wizard.xml
@@ -4,7 +4,7 @@
 
     <record id="config_call_account_template_lu" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="restart">onskip</field>
+        <field name="restart">on_trigger</field>
     </record>
 
     </data>
diff --git a/addons/l10n_ma/l10n_ma_wizard.xml b/addons/l10n_ma/l10n_ma_wizard.xml
index 4524c36fb10..4768ed60dee 100644
--- a/addons/l10n_ma/l10n_ma_wizard.xml
+++ b/addons/l10n_ma/l10n_ma_wizard.xml
@@ -4,7 +4,7 @@
 
     <record id="config_call_account_template_ma" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="restart">onskip</field>
+        <field name="restart">on_trigger</field>
     </record>
 
     </data>
diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml
index 63a56521bd8..62fe38a1642 100644
--- a/addons/l10n_uk/l10n_uk_wizard.xml
+++ b/addons/l10n_uk/l10n_uk_wizard.xml
@@ -8,7 +8,7 @@
     This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/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="restart">onskip</field>
+            <field name="restart">on_trigger</field>
         </record>
 
     </data>
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index ff0c01f8e18..4008385ff32 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -48,7 +48,7 @@
     <record id="mrp_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_mrp_installer"/>
       <field name="sequence">3</field>
-        <field name="restart">always</field>
+        <field name="restart">on_trigger</field>
       <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
     </record>
 
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index 235d2d6e392..c21f703b291 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -48,7 +48,7 @@
 
     <record id="misc_tools_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_misc_tools_installer"/>
-        <field name="restart">always</field>
+        <field name="restart">on_trigger</field>
       <field name="sequence">3</field>
     </record>
   </data>
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 32b235e4691..7200986beb2 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -50,7 +50,7 @@
 
     <record id="project_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_project_installer"/>
-        <field name="restart">always</field>
+        <field name="restart">on_trigger</field>
         <field name="sequence">3</field>
     </record>
 
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index c3369f68554..2cafbd7cd9a 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -44,7 +44,7 @@
         <!-- 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="restart">onskip</field>
+            <field name="restart">on_trigger</field>
         </record>
         
     </data>
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index 2f838c0b74c..31f6d16ae22 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -45,7 +45,7 @@
 
     <record id="report_designer_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_report_designer_installer"/>
-      <field name="restart">always</field>
+      <field name="restart">on_trigger</field>
       <field name="sequence">3</field>
     </record>
   </data>
diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml
index 4149871ad36..ad707a1abec 100644
--- a/addons/sale/sale_installer.xml
+++ b/addons/sale/sale_installer.xml
@@ -47,7 +47,7 @@
 
     <record id="sale_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_sale_installer"/>
-      <field name="restart">always</field>
+      <field name="restart">on_trigger</field>
       <field name="sequence">3</field>
       <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
     </record>