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 4bc6c555611..6a07ae8c9e7 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,7 @@
     <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="restart">always</field>
+        <field name="type">normal_recurring</field>
     </record>
 
   </data>
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 4f882728e9e..db6930b8259 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="restart">always</field>
+        <field name="type">normal_recurring</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="restart">always</field>
+        <field name="type">normal_recurring</field>
     </record>
 
   </data>
diff --git a/addons/fetchmail/fetchmail_installer_view.xml b/addons/fetchmail/fetchmail_installer_view.xml
index a3250fd6911..28c266dbc5e 100644
--- a/addons/fetchmail/fetchmail_installer_view.xml
+++ b/addons/fetchmail/fetchmail_installer_view.xml
@@ -13,7 +13,7 @@
 	    <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="restart">always</field>
+	        <field name="type">normal_recurring</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 a4951dcb121..f68b13ed54e 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -67,7 +67,7 @@
        <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="restart">always</field>
+           <field name="type">normal_recurring</field>
        </record>
 
 
diff --git a/addons/hr_evaluation/hr_evaluation_installer_view.xml b/addons/hr_evaluation/hr_evaluation_installer_view.xml
index dfadc640937..f7e8ecd45bd 100644
--- a/addons/hr_evaluation/hr_evaluation_installer_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_installer_view.xml
@@ -13,7 +13,7 @@
        <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="restart">always</field>
+           <field name="type">normal_recurring</field>
        </record>
     </data>
 </openerp>
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 613198c3200..aa6dd557be8 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -46,6 +46,7 @@ re-invoice your customer's expenses if your work by project.
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
+        'hr_expense_data.xml',
         'hr_expense_sequence.xml',
         'hr_expense_workflow.xml',
         'hr_expense_view.xml',
@@ -56,7 +57,6 @@ re-invoice your customer's expenses if your work by project.
         'board_hr_expense_view.xml',
         'board_hr_expense_manager_view.xml',
         'hr_expense_installer_view.xml',
-        'hr_expense_data.xml'
     ],
     'demo_xml': [
         'hr_expense_demo.xml',
diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index 1cbac325eda..83c2b1fcda0 100644
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -7,13 +7,14 @@
            <field name="res_model">product.product</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
+           <field name="context" eval="'{\'default_type\':\'service\',\'default_procure_method\':\'make_to_stock\',\'default_supply_method\':\'buy\',\'default_purchase_ok\':True, \'default_sale_ok\':False, \'default_hr_expense_ok\':False,\'default_categ_id\': ' + str(ref('cat_expense')) +'}'"/>
            <field name="view_id" ref="product.product_normal_form_view"/>
        </record>
 
        <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="restart">always</field>
+           <field name="type">normal_recurring</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 9826a8c5ad1..ca09ad8abe4 100644
--- a/addons/hr_recruitment/hr_recruitment_installer_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_installer_view.xml
@@ -13,7 +13,7 @@
        <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="restart">always</field>
+           <field name="type">normal_recurring</field>
        </record>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer.py
index 52b5ba5a301..b69765cfa2c 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer.py
@@ -56,7 +56,7 @@ class hr_timesheet_invoice_wizard(osv.osv_memory):
             context = {}
         res = super(hr_timesheet_invoice_wizard, self).default_get(cr, uid, fields, context=context)
         emp_obj = self.pool.get('hr.employee')
-        emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
+        emp_id = emp_obj.search(cr, uid, [], context=context)
         result = []
         data = {}
         for emp in emp_obj.browse(cr, uid, emp_id, context=context):
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 274c215fd37..f09344dec37 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
@@ -40,7 +40,7 @@
         <record id="hr_timesheet_invoice_todo" model="ir.actions.todo">
 	        <field name="action_id" ref="action_hr_timesheet_invoice_wizard"/>
 	        <field name="sequence">3</field>
-	        <field name="restart">never</field>
+	        <field name="type">normal</field>
     </record>
 
     </data>
diff --git a/addons/lunch/lunch_installer_view.xml b/addons/lunch/lunch_installer_view.xml
index bb5a7381b7a..d6bce31e80c 100644
--- a/addons/lunch/lunch_installer_view.xml
+++ b/addons/lunch/lunch_installer_view.xml
@@ -13,7 +13,7 @@
        <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="restart">always</field>
+           <field name="type">normal_recurring</field>
        </record>
     </data>
 </openerp>