[MERGE] mereged addons2 branch

bzr revid: hmo@tinyerp.com-20101015161020-azosyanmk6jdhuz1

diff --cc addons/project_long_term/project_long_term_demo.xml
index 4730706,3bc236d..8a37f4c
--- 1/addons/project_long_term/project_long_term_demo.xml
--- 2/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@@ -2,56 -2,13 +2,11 @@@
  <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">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 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>