[MERGE] Merge with lp:openobject-addons

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

diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 8d3752c..a2a5bb8 100644 (file)
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -3,6 +3,9 @@
     <data noupdate="1">
 
          <!-- Users -->
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('base.group_sale_salesman')),(4, ref('group_project_user'))]" name="groups_id"/>
+        </record>
 
         <record id="res_users_analyst" model="res.users">
             <field name="name">Phuong</field>
@@ -35,14 +38,14 @@
             <field name="password">jth</field>
         </record>
         <record id="res_users_tester" model="res.users">
-            <field name="name">Alien</field>
+            <field name="name">Aline</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
             <field name="login">apr</field>
             <field name="password">apr</field>
         </record>
         <record id="res_users_finacial_manager" model="res.users">
             <field name="name">Fabian</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_finance')])]" name="groups_id"/>
+            <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
             <field name="login">fbs</field>
             <field name="password">fbs</field>
         </record>
@@ -213,13 +216,13 @@
         </record>
 
         <!--
-       Resource: project.project
-       -->
+    Resource: project.project
+    -->
         <record id="base.main_company" model="res.company">
             <field name="project_time_mode_id" ref="product.uom_hour"></field>
         </record>
 
-               <!-- Task Types -->
+        <!-- Task Types -->
         <record id="project_tt_specification" model="project.task.type">
             <field name="sequence">1</field>
             <field name="name">Specification</field>
@@ -229,7 +232,7 @@
             <field name="name">Development</field>
         </record>
         <record id="project_tt_testing" model="project.task.type">
-               <field name="sequence">3</field>
+            <field name="sequence">3</field>
             <field name="name">Testing</field>
         </record>
         <record id="project_tt_merge" model="project.task.type">
@@ -237,7 +240,13 @@
             <field name="name">Merge</field>
         </record>
 
-               <!-- Projects -->
+        <!-- Projects -->
+        <!-- <record id="all_projects_account" model="project.project">
+            <field name="name">Projects</field>
+            <field name="code">3</field>
+        </record> -->
+        
+
         <record id="project_project_9" model="project.project">
             <field name="warn_manager">1</field>
             <field name="name">OpenERP Integration</field>
@@ -248,30 +257,30 @@
         <record id="project_project_21" model="project.project">
             <field name="warn_manager">1</field>
             <field name="priority">10</field>
-            <field name="parent_id" ref="project_project_9"/>
+            <field name="parent_id" ref="all_projects_account"/>
             <field name="name">Study + Prototype</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development')])]" name="type_ids"/>
         </record>
         <record id="project_project_22" model="project.project">
             <field name="priority">20</field>
-            <field name="parent_id" ref="project_project_9"/>
+            <field name="parent_id" ref="all_projects_account"/>
             <field name="name">Specific Developments</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="[(6, 0, [ref('project_tt_specification'), ref('project_tt_development')])]" name="type_ids"/>
         </record>
         <record id="project_project_23" model="project.project">
             <field name="priority">30</field>
-            <field name="parent_id" ref="project_project_9"/>
+            <field name="parent_id" ref="all_projects_account"/>
             <field name="name">Install, data import, configuration</field>
             <field eval="[(6, 0, [ref('project_tt_development')])]" name="type_ids"/>
         </record>
 
-               <!-- Tasks -->
+        <!-- Tasks -->
         <record id="project_task_116" model="project.task">
             <field name="planned_hours">38.0</field>
             <field name="remaining_hours">38.0</field>
-            <field name="type" ref="project_tt_development"/>
+            <field name="type_id" ref="project_tt_development"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="description">BoM, After sales returns, interventions. Traceability.</field>
@@ -280,7 +289,7 @@
         <record id="project_task_130" model="project.task">
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
-            <field name="type" ref="project_tt_development"/>
+            <field name="type_id" ref="project_tt_development"/>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Data importation + Doc</field>
@@ -288,7 +297,7 @@
         <record id="project_task_131" model="project.task">
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
-            <field name="type" ref="project_tt_development"/>
+            <field name="type_id" ref="project_tt_development"/>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Modifications asked by the customer.</field>
@@ -296,7 +305,7 @@
         <record id="project_task_184" model="project.task">
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
-            <field name="type" ref="project_tt_development"/>
+            <field name="type_id" ref="project_tt_development"/>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project_project_21"/>
@@ -306,7 +315,7 @@
             <field name="sequence">15</field>
             <field name="planned_hours">8.0</field>
             <field name="remaining_hours">8.0</field>
-            <field name="type" ref="project_tt_development"/>
+            <field name="type_id" ref="project_tt_development"/>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Internal testing + Software Install</field>
@@ -315,7 +324,7 @@
             <field name="sequence">17</field>
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
-            <field name="type" ref="project_tt_development"/>
+            <field name="type_id" ref="project_tt_development"/>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="priority">2</field>
             <field name="state">open</field>
@@ -357,7 +366,6 @@
             <field name="project_id" ref="project_project_21"/>
             <field name="name">MRP; functional layer</field>
             <field name="state">done</field>
-            <field eval="time.strftime('%Y-%m-%d 12:12')" name="date_close"/>
         </record>
         <record id="project_task_194" model="project.task">
             <field name="sequence">30</field>
@@ -430,6 +438,7 @@
             <field name="remaining_hours">24.0</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="project_id" ref="project_project_22"/>
+            <field name="state">open</field>
             <field name="name">Validation + latest modifications.</field>
         </record>
         <record id="project_task_203" model="project.task">