[MERGE]: Merged with latest trunk-addons as there are many changes regarding config wizards

bzr revid: rpa@tinyerp.com-20110805060610-dg2vy1e62qxoycjo

1 files changed, 39 insertions, 42 deletions

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 722f7a6de45..91963737e12 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -14,9 +14,9 @@
           <xpath expr="//label[@string='description']" position="attributes">
                 <attribute name="string">Select the Applications you want your system to cover. If you are not sure about your exact needs at this stage, you can easily install them later.</attribute>
           </xpath>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='string'></attribute>
-                    <attribute name='rowspan'>15</attribute>
+          <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                    <attribute name="string"/>
+                    <attribute name="rowspan">15</attribute>
           </xpath>
           <xpath expr="//button[@string='Install Modules']" position="attributes">
                     <attribute name="string">Install</attribute>
@@ -75,9 +75,22 @@
         <field name="action_id" ref="action_base_setup_installer"/>
         <field name="category_id" ref="base.category_administration_config"/>
         <field name="sequence">2</field>
-        <field name="type">normal_recurring</field>
     </record>
 
+    <record id="action_start_configurator" model="ir.actions.server">
+      <field name="name">Start Configuration</field>
+      <field name="model_id" ref="base.model_ir_actions_todo"/>
+      <field name="state">code</field>
+      <field name="code" eval="'# obj is a browse_record and will provide stupid ids to method\n' 'action = obj.pool.get(\'ir.actions.todo\').action_launch(cr, uid, ' + str([ref('base_setup_installer_todo')]) + ', context=context)'"/>
+    </record>
+    
+    <menuitem name="Add More Features" action="action_start_configurator" id="menu_view_base_module_configuration" parent="base.menu_config" type="server" icon="STOCK_EXECUTE" sequence="100"/>
+    <record id="ir_ui_view_sc_configuration" model="ir.ui.view_sc">
+      <field name="name">Add More Features</field>
+      <field name="resource">ir.ui.menu</field>
+      <field name="user_id" ref="base.user_root"/>
+      <field name="res_id" ref="menu_view_base_module_configuration"/>
+    </record>
 <!--     Migrate data from another application Conf Wiz-->
 
     <record id="view_migrade_application_installer_modules" model="ir.ui.view">
@@ -99,8 +112,8 @@
                 <xpath expr="//button[@string='Install Modules']" position="attributes">
                     <attribute name="string">Configure</attribute>
                 </xpath>
-                <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='string'></attribute>
+                <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                    <attribute name="string"/>
                 </xpath>
                 <group colspan="8">
                     <field name="import_saleforce"/>
@@ -125,8 +138,6 @@
    <record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_migrade_application_installer_modules"/>
       <field name="category_id" ref="base.category_administration_config"/>
-      <field name="type">normal</field>
-      <field name="state">skip</field>
   </record>
 
           <!-- Import or create customers configartion view  -->
@@ -145,10 +156,7 @@
 	<record id="config_wizard_action_import_create_installer" model="ir.actions.todo">
 	    <field name="action_id" ref="action_import_create_installer"/>
 	    <field name="category_id" ref="base.category_administration_config"/>
-	    <field name="type">normal</field>
-	    <field name="target">current</field>
-	    <field name="state">skip</field>
-	</record>
+    </record>
 
 	<!--        Define default users preferences-->
 
@@ -162,23 +170,22 @@
               <form position="attributes">
                 <attribute name="string">Define default users preferences</attribute>
               </form>
-            <xpath expr='//separator[@string="title"]' position='attributes'>
-                  <attribute name='string'>Define default users preferences</attribute>
+            <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
+                  <attribute name="string">Define default users preferences</attribute>
             </xpath>
-            <xpath expr="//label[@string='description']"
-               position="attributes">
+            <xpath expr="//label[@string='description']" position="attributes">
               <attribute name="string">Specify default values. This will set the default values for each new user, each user is free to change his own preferences.</attribute>
             </xpath>
-            <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                  <attribute name='string'></attribute>
-                  <attribute name='rowspan'>12</attribute>
+            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                  <attribute name="string"/>
+                  <attribute name="rowspan">12</attribute>
             </xpath>
              <group string="res_config_contents" position="replace">
                     <group colspan="4">
-                        <field colspan="4" name="view" />
-                        <field colspan="4" name="context_lang" />
-                        <field colspan="4" name="context_tz" />
-                        <field colspan="4" name="menu_tips" />
+                        <field colspan="4" name="view"/>
+                        <field colspan="4" name="context_lang"/>
+                        <field colspan="4" name="context_tz"/>
+                        <field colspan="4" name="menu_tips"/>
                   </group>
               </group>
             </data>
@@ -200,8 +207,6 @@
       <record id="config_action_user_preferences_config_form" model="ir.actions.todo">
           <field name="action_id" ref="action_user_preferences_config_form"/>
           <field name="category_id" ref="base.category_administration_config"/>
-          <field name="type">normal</field>
-          <field name="state">skip</field>
       </record>
 
       <!--     Config Wiz   Create New User's Login   -->
@@ -220,10 +225,8 @@
       <record id="config_wizard_action_config_user_form" model="ir.actions.todo">
           <field name="action_id" ref="action_config_access_other_user"/>
           <field name="category_id" ref="base.category_administration_config"/>
-          <field name="type">normal</field>
-          <field name="target">current</field>
           <field name="sequence">1000</field>
-          <field name="state">cancel</field>
+          <field name="state">done</field>
       </record>
 
       <!--   register Upload Logo configuration wizard  -->
@@ -231,8 +234,7 @@
       <record id="config_wizard_action_res_company_logo" model="ir.actions.todo">
           <field name="action_id" ref="action_res_company_logo"/>
           <field name="category_id" ref="base.category_administration_config"/>
-          <field name="type">normal</field>
-          <field name="state">cancel</field>
+          <field name="state">done</field>
       </record>
 
             <!--        Specify Your Terminology Config Wiz-->
@@ -247,20 +249,19 @@
               <form position="attributes">
                 <attribute name="string">Specify Your Terminology</attribute>
               </form>
-            <xpath expr='//separator[@string="title"]' position='attributes'>
-                  <attribute name='string'>Specify Your Terminology</attribute>
+            <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
+                  <attribute name="string">Specify Your Terminology</attribute>
             </xpath>
-            <xpath expr="//label[@string='description']"
-               position="attributes">
+            <xpath expr="//label[@string='description']" position="attributes">
               <attribute name="string">Based on the industry needs you can use this wizard to change the terminologies for Partners. </attribute>
             </xpath>
-            <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                  <attribute name='string'></attribute>
-                 <attribute name='rowspan'>12</attribute>
+            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                  <attribute name="string"/>
+                 <attribute name="rowspan">12</attribute>
             </xpath>
              <group string="res_config_contents" position="replace">
                     <group colspan="4">
-                        <field colspan="4" name="partner" />
+                        <field colspan="4" name="partner"/>
                   </group>
               </group>
             </data>
@@ -282,8 +283,6 @@
       <record id="config_action_partner_terminology_config_form" model="ir.actions.todo">
           <field name="action_id" ref="action_partner_terminology_config_form"/>
           <field name="category_id" ref="base.category_administration_config"/>
-          <field name="type">normal</field>
-          <field name="state">skip</field>
       </record>
 
 
@@ -301,8 +300,6 @@
         <field name="action_id" ref="action_base_setup_company"/>
         <field name="category_id" ref="base.category_administration_config"/>
         <field name="sequence">1</field>
-        <field name="type">normal</field>
-        <field name="state">skip</field>
     </record>
 
   </data>