[MERGE] trunk-usability rco

[odoo/odoo.git] / addons / project / project_installer.xml

diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index d7ca8c4..d6538ac 100644 (file)
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -1,54 +1,27 @@
 <openerp>
   <data>
+
     <record id="view_project_installer" model="ir.ui.view">
       <field name="name">project.installer.view</field>
-      <field name="model">project.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
-        <data>
-          <form position="attributes">
-            <attribute name="string">Project Modules Installation</attribute>
-          </form>
-
-          <separator string="title" position="attributes">
-            <attribute name="string"
-                       >Configure Your Project Management</attribute>
-          </separator>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Various OpenERP applications are available to bring your project management to the next levels of control and flexibility.</attribute>
+          <data>
+          <xpath expr="//group[@name='project']" position="replace">
+            <newline/>
+            <separator  string="Project Management Features" colspan="4" />
+            <field name="project_issue" />
+            <field name="project_long_term" />
+            <field name="hr_timesheet_sheet" />
+            <field name="project_timesheet" />
+            <field name="account_budget" />
+            <field name="project_scrum" />
+            <field name="project_gtd" />
           </xpath>
-          <group colspan="8">
-            <separator string="Project Management" colspan="4"/>
-            <field name="project_long_term"/>
-            <field name="project_wiki"/>
-            <field name="hr_timesheet_sheet"/>
-            <field name="hr_timesheet_invoice"/>
-            <field name="account_budget"/>
-            <field name="project_messages"/>
-            <field name="project_crm"/>
-            <separator string="Methodologies" colspan="4"/>
-            <field name="scrum"/>
-            <field name="project_gtd"/>
-          </group>
         </data>
       </field>
     </record>
 
-    <record id="action_project_installer" model="ir.actions.act_window">
-      <field name="name">Project Modules Installation</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">project.installer</field>
-      <field name="view_id" ref="view_project_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="project_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_project_installer"/>
-      <field name="sequence">3</field>
-    </record>
   </data>
 </openerp>