[MERGE]:Merge with trunk-configuration-rework

bzr revid: ksa@tinyerp.co.in-20110411131208-q930q31zpxg9y7fn

diff --cc addons/crm/crm_installer_view.xml
index 0f7ff03,7e95d19..4f88272
--- 1/addons/crm/crm_installer_view.xml
--- 2/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@@ -61,39 -61,8 +61,39 @@@
      <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">on_trigger</field>
+         <field name="type">special</field>
          <field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
      </record>
 +
 +    <record model="ir.actions.act_window" id="crm_case_section_view_form_installer">
 +        <field name="name">Create sales team</field>
 +        <field name="type">ir.actions.act_window</field>
 +        <field name="res_model">crm.case.section</field>
 +        <field name="view_type">form</field>
 +        <field name="view_mode">tree,form</field>
 +        <field name="view_id" ref="crm.crm_case_section_view_form"/>
 +    </record>
 +
 +    <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>
 +    </record>
 +
 +    <record model="ir.actions.act_window" id="crm_case_stage_form_installer">
 +        <field name="name">Review Sales Stages</field>
 +        <field name="type">ir.actions.act_window</field>
 +        <field name="res_model">crm.case.stage</field>
 +        <field name="view_type">form</field>
 +        <field name="view_mode">tree,form</field>
 +        <field name="view_id" ref="crm.crm_case_stage_form"/>
 +    </record>
 +
 +    <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>
 +    </record>
 +
    </data>
  </openerp>

diff --cc addons/hr/hr_installer.xml
index c1d7eaa,64973a5..a4951dc
--- 1/addons/hr/hr_installer.xml
--- 2/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@@ -52,24 -52,8 +52,24 @@@
      <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">on_trigger</field>
+             <field name="type">special</field>
      </record>
  
 +         <record model="ir.actions.act_window" id="view_employee_form_installer">
 +           <field name="name">Create Your Employees</field>
 +           <field name="type">ir.actions.act_window</field>
 +           <field name="res_model">hr.employee</field>
 +           <field name="view_type">form</field>
 +           <field name="view_mode">tree,form</field>
 +           <field name="view_id" ref="hr.view_employee_form"/>
 +       </record>
 +
 +       <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>
 +       </record>
 +
 +
    </data>
  </openerp>