diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d2da8e6ea9e..08ec23bd872 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -101,7 +101,6 @@
 
     <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
     <menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
-    <menuitem id="menu_partner_invc" parent="base.menu_project_management_time_tracking" action="account.action_invoice_tree1"/>
 
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index e365d095a20..8d3752c0979 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -2,6 +2,216 @@
 <openerp>
     <data noupdate="1">
 
+         <!-- Users -->
+
+        <record id="res_users_analyst" model="res.users">
+            <field name="name">Phuong</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
+            <field name="login">phu</field>
+            <field name="password">phu</field>
+        </record>
+        <record id="res_users_project_manager" model="res.users">
+            <field name="name">Anthony</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
+            <field name="login">al</field>
+            <field name="password">al</field>
+        </record>
+        <record id="res_users_technical_leader" model="res.users">
+            <field name="name">Quentin</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
+            <field name="login">qdp</field>
+            <field name="password">qdp</field>
+        </record>
+        <record id="res_users_developer" model="res.users">
+            <field name="name">Francois</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
+            <field name="login">fpi</field>
+            <field name="password">fpi</field>
+        </record>
+        <record id="res_users_designer" model="res.users">
+            <field name="name">Julien</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
+            <field name="login">jth</field>
+            <field name="password">jth</field>
+        </record>
+        <record id="res_users_tester" model="res.users">
+            <field name="name">Alien</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 name="login">fbs</field>
+            <field name="password">fbs</field>
+        </record>
+
+        <!-- Projects -->
+        <record id="project_integrate_openerp" model="project.project">
+            <field name="date_start" eval="time.strftime('%Y-%m-01 10:00:00')"/>
+            <field name="state">open</field>
+            <field name="type">normal</field>
+            <field name="description">Integrate a Sale and Warehouse Management.</field>
+            <field eval="[(6, 0, [
+                    ref('project.res_users_analyst'),
+                    ref('project.res_users_project_manager'),
+                    ref('project.res_users_technical_leader'),
+                    ref('project.res_users_developer'),
+                    ref('project.res_users_designer'),
+                    ref('project.res_users_tester'),
+                    ref('project.res_users_finacial_manager')])]" name="members"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="name">Integrate a Sale and Warehouse Management.</field>
+        </record>
+
+        <!-- Tasks -->
+
+        <record id="project_task_1" model="project.task">
+            <field eval="100.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Prepare Requirements Document</field>
+        </record>
+
+        <record id="project_task_2" model="project.task">
+            <field eval="80.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Make SRS</field>
+        </record>
+
+        <record id="project_task_3" model="project.task">
+            <field eval="40.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Design Use Cases</field>
+        </record>
+
+        <record id="project_task_4" model="project.task">
+            <field eval="25.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Budget Planning</field>
+        </record>
+
+        <record id="project_task_5" model="project.task">
+            <field eval="25.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Quality Planning</field>
+        </record>
+
+        <record id="project_task_6" model="project.task">
+            <field eval="20.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Risk Management Planning</field>
+        </record>
+
+        <record id="project_task_7" model="project.task">
+            <field eval="30.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Create Project Schedules</field>
+        </record>
+
+        <record id="project_task_8" model="project.task">
+            <field eval="10.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Dataflow Design</field>
+        </record>
+
+        <record id="project_task_9" model="project.task">
+            <field eval="50.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">User Interface Design</field>
+        </record>
+
+        <record id="project_task_10" model="project.task">
+            <field eval="40.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Develop Module in Sale Management</field>
+        </record>
+
+        <record id="project_task_11" model="project.task">
+            <field eval="90.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Develop module in Warehouse</field>
+        </record>
+
+        <record id="project_task_12" model="project.task">
+            <field eval="20.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Integrate Modules</field>
+        </record>
+
+        <record id="project_task_13" model="project.task">
+            <field eval="50.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_tester"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Unit Testing</field>
+        </record>
+
+        <record id="project_task_14" model="project.task">
+            <field eval="30.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_tester"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Regression Test</field>
+        </record>
+
+        <record id="project_task_15" model="project.task">
+            <field eval="15.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Documentation</field>
+        </record>
+
+        <record id="project_task_16" model="project.task">
+            <field eval="10" name="sequence"/>
+            <field eval="40.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_tester"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Performance Tuning</field>
+        </record>
+
+        <record id="project_task_17" model="project.task">
+            <field eval="5.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Deploy and Review on Customer System</field>
+        </record>
+
+        <record id="project_task_18" model="project.task">
+            <field eval="10.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Training and Presentation</field>
+        </record>
+
         <!--
 	Resource: project.project
 	-->
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 4de53c0f38d..3bc236dee26 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -2,115 +2,56 @@
 <openerp>
     <data noupdate="1">
 <!--
-This Demo data file includes Users, Human Resources, Projects and it' members list, Phases and Resources,Tasks allocation and  also run scheduling of phase and tasks.
+This Demo data file Human Resources, Phases and Resources,Tasks allocation and  also run scheduling of phase and tasks.
 -->
-        <!-- Users -->
-
-        <record id="res_users_analyst" model="res.users">
-            <field name="name">Phuong</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
-            <field name="login">phu</field>
-            <field name="password">phu</field>
-        </record>
-        <record id="res_users_project_manager" model="res.users">
-            <field name="name">Anthony</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
-            <field name="login">al</field>
-            <field name="password">al</field>
-        </record>
-        <record id="res_users_technical_leader" model="res.users">
-            <field name="name">Quentin</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
-            <field name="login">qdp</field>
-            <field name="password">qdp</field>
-        </record>
-        <record id="res_users_developer" model="res.users">
-            <field name="name">Francois</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
-            <field name="login">fpi</field>
-            <field name="password">fpi</field>
-        </record>
-        <record id="res_users_designer" model="res.users">
-            <field name="name">Julien</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
-            <field name="login">jth</field>
-            <field name="password">jth</field>
-        </record>
-        <record id="res_users_tester" model="res.users">
-            <field name="name">Alien</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 name="login">fbs</field>
-            <field name="password">fbs</field>
-        </record>
+       
 
         <!-- Human Resources -->
         <record id="resource_analyst" model="resource.resource">
-            <field name="user_id" ref="res_users_analyst"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
             <field name="name">Analyst</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
         <record id="resource_project_manager" model="resource.resource">
-            <field name="user_id" ref="res_users_project_manager"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
             <field name="name">Project Manager</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
          <record id="resource_technical_leader" model="resource.resource">
-            <field name="user_id" ref="res_users_technical_leader"/>
+            <field name="user_id" ref="project.res_users_technical_leader"/>
             <field name="name">Technical Leader</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
         <record id="resource_developer" model="resource.resource">
-            <field name="user_id" ref="res_users_developer"/>
+            <field name="user_id" ref="project.res_users_developer"/>
             <field name="name">Developer</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
         <record id="resource_designer" model="resource.resource">
-            <field name="user_id" ref="res_users_designer"/>
+            <field name="user_id" ref="project.res_users_designer"/>
             <field name="name">Designer</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
         <record id="resource_tester" model="resource.resource">
-            <field name="user_id" ref="res_users_tester"/>
+            <field name="user_id" ref="project.res_users_tester"/>
             <field name="name">Tester</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
         <record id="resource_finacial_manager" model="resource.resource">
-            <field name="user_id" ref="res_users_finacial_manager"/>
+            <field name="user_id" ref="project.res_users_finacial_manager"/>
             <field name="name">Project Finacial Manager</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
 
 
-        <!-- Projects -->
-        <record id="project_integrate_openerp" model="project.project">
-            <field name="date_start" eval="time.strftime('%Y-%m-01 10:00:00')"/>
-            <field name="state">open</field>
-            <field name="type">normal</field>
-            <field name="description">Integrate an Sale and Warehouse Management.</field>
-            <field eval="[(6, 0, [
-                    ref('res_users_analyst'),
-                    ref('res_users_project_manager'),
-                    ref('res_users_technical_leader'),
-                    ref('res_users_developer'),
-                    ref('res_users_designer'),
-                    ref('res_users_tester'),
-                    ref('res_users_finacial_manager')])]" name="members"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="name">Integrate an Sale and Warehouse Management.</field>
-        </record>
+        
 
         <!-- Project Phases -->
         <record id="project_phase_1" model="project.phase">
@@ -119,8 +60,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="1" name="sequence"/>
             <field name="duration">30</field>
-            <field name="responsible_id" ref="res_users_analyst"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_analyst"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <record id="project_phase_2" model="project.phase">
@@ -129,8 +70,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="2" name="sequence"/>
             <field name="duration">20</field>
-            <field name="responsible_id" ref="res_users_project_manager"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_project_manager"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <record id="project_phase_3" model="project.phase">
@@ -139,8 +80,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="3" name="sequence"/>
             <field name="duration">20</field>
-            <field name="responsible_id" ref="res_users_project_manager"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_project_manager"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <record id="project_phase_4" model="project.phase">
@@ -149,8 +90,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="4" name="sequence"/>
             <field name="duration">90</field>
-            <field name="responsible_id" ref="res_users_technical_leader"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_technical_leader"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <record id="project_phase_5" model="project.phase">
@@ -159,8 +100,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="5" name="sequence"/>
             <field name="duration">30</field>
-            <field name="responsible_id" ref="res_users_project_manager"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_project_manager"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <record id="project_phase_6" model="project.phase">
@@ -169,8 +110,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="5" name="sequence"/>
             <field name="duration">10</field>
-            <field name="responsible_id" ref="res_users_analyst"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_analyst"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <!--  Project Resource Allocation -->
@@ -221,173 +162,82 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
 
         <!-- Tasks -->
 
-        <record id="project_task_1" model="project.task">
-            <field eval="100.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_analyst"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Prepare Requirements Document</field>
+        <record id="project.project_task_1" model="project.task">
             <field name="phase_id" ref="project_phase_1"/>
         </record>
 
-        <record id="project_task_2" model="project.task">
-            <field eval="80.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_analyst"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Make SRS</field>
+        <record id="project.project_task_2" model="project.task">
             <field name="phase_id" ref="project_phase_1"/>
         </record>
 
-        <record id="project_task_3" model="project.task">
-            <field eval="40.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Design Use Cases</field>
+        <record id="project.project_task_3" model="project.task">
             <field name="phase_id" ref="project_phase_2"/>
         </record>
 
-        <record id="project_task_4" model="project.task">
-            <field eval="25.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Budget Planning</field>
+        <record id="project.project_task_4" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_5" model="project.task">
-            <field eval="25.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Quality Planning</field>
+        <record id="project.project_task_5" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_6" model="project.task">
-            <field eval="20.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Risk Management Planning</field>
+        <record id="project.project_task_6" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_7" model="project.task">
-            <field eval="30.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Create Project Schedules</field>
+        <record id="project.project_task_7" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_8" model="project.task">
-            <field eval="10.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Dataflow Design</field>
+        <record id="project.project_task_8" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_9" model="project.task">
-            <field eval="50.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">User Interface Design</field>
+        <record id="project.project_task_9" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_10" model="project.task">
-            <field eval="40.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_developer"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Develop Module in Sale Management</field>
+        <record id="project.project_task_10" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_11" model="project.task">
-            <field eval="90.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_developer"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Develop module in Warehouse</field>
+        <record id="project.project_task_11" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_12" model="project.task">
-            <field eval="20.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_developer"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Integrate Modules</field>
+        <record id="project.project_task_12" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_13" model="project.task">
-            <field eval="50.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_tester"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Unit Testing</field>
+        <record id="project.project_task_13" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_14" model="project.task">
-            <field eval="30.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_tester"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Regression Test</field>
+        <record id="project.project_task_14" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_15" model="project.task">
-            <field eval="15.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_developer"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Documentation</field>
+        <record id="project.project_task_15" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_16" model="project.task">
-            <field eval="10" name="sequence"/>
-            <field eval="40.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_tester"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Performance Tuning</field>
+        <record id="project.project_task_16" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_17" model="project.task">
-            <field eval="5.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_analyst"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Deploy and Review on Customer System</field>
+        <record id="project.project_task_17" model="project.task">
             <field name="phase_id" ref="project_phase_6"/>
         </record>
 
-        <record id="project_task_18" model="project.task">
-            <field eval="10.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_analyst"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Training and Presentation</field>
+        <record id="project.project_task_18" model="project.task">
             <field name="phase_id" ref="project_phase_6"/>
         </record>
 
         <!-- run scheduling of phase -->
-        <function model="project.project" name="schedule_phases" eval="(ref('project_integrate_openerp'),)"/>
+        <function model="project.project" name="schedule_phases" eval="(ref('project.project_integrate_openerp'),)"/>
         <!-- run scheduling of tasks -->
-        <function model="project.project" name="schedule_tasks" eval="(ref('project_integrate_openerp'),)"/>
+        <function model="project.project" name="schedule_tasks" eval="(ref('project.project_integrate_openerp'),)"/>
 
     </data>
 </openerp>
diff --git a/addons/project_long_term/test/schedule_phase_tasks.yml b/addons/project_long_term/test/schedule_phase_tasks.yml
index 150d80af822..aa54fa1ac57 100644
--- a/addons/project_long_term/test/schedule_phase_tasks.yml
+++ b/addons/project_long_term/test/schedule_phase_tasks.yml
@@ -4,13 +4,13 @@
   !record {model: project.project, id: project_project_project0}:
     name: Develop an outlook-openerp synchronization plugin
     members:
-      - project_long_term.res_users_project_manager
-      - project_long_term.res_users_technical_leader
-      - project_long_term.res_users_developer
-      - project_long_term.res_users_designer
-      - project_long_term.res_users_tester
-      - project_long_term.res_users_analyst
-      - project_long_term.res_users_finacial_manager
+      - project.res_users_project_manager
+      - project.res_users_technical_leader
+      - project.res_users_developer
+      - project.res_users_designer
+      - project.res_users_tester
+      - project.res_users_analyst
+      - project.res_users_finacial_manager
 - 
   Create phase 'Develop GUI' in Outlook
 - 
@@ -40,7 +40,7 @@
     state: draft
     phase_id: project_phase_phase0
     project_id: project_project_project0
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
     
 - 
   Create the phase task 'Develop GUI for Modules Configuration'
@@ -52,7 +52,7 @@
     state: draft
     phase_id: project_phase_phase0
     project_id: project_project_project0
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
 - 
   Create the phase task 'Develop GUI for OpenERP Synchronisation'
 - 
@@ -63,7 +63,7 @@
     state: draft
     phase_id: project_phase_phase0
     project_id: project_project_project0
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
 - 
   Create the phase task 'Design required GUI/Menus'
 - 
@@ -74,7 +74,7 @@
     state: draft
     phase_id: project_phase_phase0
     project_id: project_project_project0
-    user_id: project_long_term.res_users_designer
+    user_id: project.res_users_designer
     
 - 
   Schedule phase tasks
diff --git a/addons/project_long_term/test/schedule_project_tasks.yml b/addons/project_long_term/test/schedule_project_tasks.yml
index dfc4cf1fc5e..04a05437487 100644
--- a/addons/project_long_term/test/schedule_project_tasks.yml
+++ b/addons/project_long_term/test/schedule_project_tasks.yml
@@ -4,13 +4,13 @@
   !record {model: project.project, id: project_project_project1}:
     name: Develop a thunderbird-openerp synchronization plugin
     members:
-      - project_long_term.res_users_project_manager
-      - project_long_term.res_users_technical_leader
-      - project_long_term.res_users_developer
-      - project_long_term.res_users_designer
-      - project_long_term.res_users_tester
-      - project_long_term.res_users_analyst
-      - project_long_term.res_users_finacial_manager
+      - project.res_users_project_manager
+      - project.res_users_technical_leader
+      - project.res_users_developer
+      - project.res_users_designer
+      - project.res_users_tester
+      - project.res_users_analyst
+      - project.res_users_finacial_manager
         
 - 
   Create phase 'Develop GUI' in thunderbird
@@ -41,7 +41,7 @@
     state: draft
     phase_id: project_phase_phase1
     project_id: project_project_project1
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
     
 - 
   Create the phase task 'Develop GUI for Modules Configuration'
@@ -53,7 +53,7 @@
     state: draft
     phase_id: project_phase_phase1
     project_id: project_project_project1
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
 - 
   Create the phase task 'Develop GUI for OpenERP Synchronisation'
 - 
@@ -64,7 +64,7 @@
     state: draft
     phase_id: project_phase_phase1
     project_id: project_project_project1
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
 - 
   Create the phase task 'Design required GUI/Menus'
 - 
@@ -75,7 +75,7 @@
     state: draft
     phase_id: project_phase_phase1
     project_id: project_project_project1
-    user_id: project_long_term.res_users_designer
+    user_id: project.res_users_designer
     
     
 - 
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index e1be86fe661..fbf3d389739 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -33,7 +33,7 @@
     'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice'],
     'init_xml': [],
     'update_xml': ["security/ir.model.access.csv","process/project_timesheet_process.xml", "report/task_report_view.xml", "project_timesheet_view.xml"],
-    'demo_xml': [],
+    'demo_xml': ["project_timesheet_demo.xml"],
     'test': [
         'test/worktask_entry_to_timesheetline_entry.yml',
     ],
diff --git a/addons/project_timesheet/project_timesheet_demo.xml b/addons/project_timesheet/project_timesheet_demo.xml
new file mode 100644
index 00000000000..8eec74bc9e5
--- /dev/null
+++ b/addons/project_timesheet/project_timesheet_demo.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- Example employee -->
+        <record id="hr.employee2" model="hr.employee">
+            <field name="user_id" ref="project.res_users_technical_leader"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+
+        <record id="hr.employee3" model="hr.employee">
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+
+        <record id="hr.employee4" model="hr.employee">
+            <field name="name">Phuong</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+
+        <record id="hr.employee5" model="hr.employee">
+            <field name="name">Francois</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+        <record id="hr.employee6" model="hr.employee">
+            <field name="name">Julien</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="user_id" ref="project.res_users_designer"/>
+            <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+        <record id="hr.employee7" model="hr.employee">
+            <field name="name">Alien</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="user_id" ref="project.res_users_tester"/>
+            <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+        <record id="hr.employee8" model="hr.employee">
+            <field name="name">Fabian</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="user_id" ref="project.res_users_finacial_manager"/>
+            <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+
+    </data>
+</openerp>