[MERGE]: Merged with lp:openobject-addons

bzr revid: atp@tinyerp.com-20120813121211-h22wjo6mn9adbrkz

3 files changed, 21 insertions, 65 deletions

diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 4cd6d5cdec4..bca8231fdaa 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -5,7 +5,7 @@
         This Demo data file Human Resources, Phases and Resources,Tasks allocation and  also run scheduling of phase and tasks.
         -->
 
-        <record id="project.project_integrate_openerp" model="project.project">
+        <record id="project.project_project_1" model="project.project">
             <field name="resource_calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
@@ -14,11 +14,11 @@
         <record id="project_phase_1" model="project.phase">
             <field eval="[(6, 0, [])]" name="previous_phase_ids"/>
             <field name="name">Collect Requirement and Make SRS</field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="1" name="sequence"/>
             <field name="duration">30</field>
             <field name="constraint_date_start" eval="time.strftime('%Y-%m-01 10:00:00')"></field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
 
         <function model="project.phase" name="set_open" eval="[ref('project_phase_1')]"/>
@@ -26,48 +26,48 @@
         <record id="project_phase_2" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_1')])]" name="previous_phase_ids"/>
             <field name="name">Design Model</field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="2" name="sequence"/>
             <field name="duration">20</field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
         <function model="project.phase" name="set_open" eval="[ref('project_phase_2')]"/>
         
         <record id="project_phase_3" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_2')])]" name="previous_phase_ids"/>
             <field name="name">Planning and compute Risk analysis, Time chart </field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="3" name="sequence"/>
             <field name="duration">20</field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
         <function model="project.phase" name="set_open" eval="[ref('project_phase_3')]"/>
 
         <record id="project_phase_4" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_3')])]" name="previous_phase_ids"/>
             <field name="name">Development and Integration</field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="4" name="sequence"/>
             <field name="duration">90</field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
 
         <record id="project_phase_5" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_4')])]" name="previous_phase_ids"/>
             <field name="name">Review and Testing</field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="5" name="sequence"/>
             <field name="duration">30</field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
 
         <record id="project_phase_6" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_5')])]" name="previous_phase_ids"/>
             <field name="name">Deployement and Training</field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="6" name="sequence"/>
             <field name="duration">10</field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
 
         <function model="project.phase" name="set_open" eval="[ref('project_phase_6')]"/>
@@ -90,65 +90,21 @@
         </record>
 
         <record id="project.project_task_5" model="project.task">
-            <field name="phase_id" ref="project_phase_3"/>
+            <field name="phase_id" ref="project_phase_4"/>
         </record>
 
         <record id="project.project_task_6" model="project.task">
-            <field name="phase_id" ref="project_phase_3"/>
+            <field name="phase_id" ref="project_phase_5"/>
         </record>
 
         <record id="project.project_task_7" model="project.task">
-            <field name="phase_id" ref="project_phase_3"/>
-        </record>
-
-        <record id="project.project_task_8" model="project.task">
-            <field name="phase_id" ref="project_phase_3"/>
-        </record>
-
-        <record id="project.project_task_9" model="project.task">
-            <field name="phase_id" ref="project_phase_3"/>
-        </record>
-
-        <record id="project.project_task_10" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_11" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_12" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_13" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_14" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_15" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_16" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_17" model="project.task">
-            <field name="phase_id" ref="project_phase_6"/>
-        </record>
-
-        <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.project_integrate_openerp'),)"/>-->
+        <!--<function model="project.project" name="schedule_phases" eval="(ref('project.project_project_1'),)"/>-->
         <!-- run scheduling of tasks -->
-        <!--<function model="project.project" name="schedule_tasks" eval="(ref('project.project_integrate_openerp'),)"/>-->
+        <!--<function model="project.project" name="schedule_tasks" eval="(ref('project.project_project_1'),)"/>-->
 
     </data>
 </openerp>
diff --git a/addons/project_long_term/test/phase_process.yml b/addons/project_long_term/test/phase_process.yml
index 725c5b2a97d..8738834b103 100644
--- a/addons/project_long_term/test/phase_process.yml
+++ b/addons/project_long_term/test/phase_process.yml
@@ -5,7 +5,7 @@
 -
   !record {model: project.compute.phases, id: project_compute_phases01}:
     target_project: 'one'
-    project_id: project.project_integrate_openerp
+    project_id: project.project_project_1
 -
   I schedule the phases.
 -
@@ -15,7 +15,7 @@
   I check the starting date and ending date on the phases after scheduling.
 -
   !python {model: project.project}: |
-     project = self.browse(cr, uid, ref("project.project_integrate_openerp"), context=context)
+     project = self.browse(cr, uid, ref("project.project_project_1"), context=context)
      def _convert(date):
         import time
         return time.strptime(date, '%Y-%m-%d %H:%M:%S')
diff --git a/addons/project_long_term/test/task_process.yml b/addons/project_long_term/test/task_process.yml
index 64ecef73476..a7065de315f 100644
--- a/addons/project_long_term/test/task_process.yml
+++ b/addons/project_long_term/test/task_process.yml
@@ -2,7 +2,7 @@
   I create a record to compute the tasks of project.
 -
   !record {model: project.compute.tasks, id: project_compute_tasks0}:
-    project_id: project.project_integrate_openerp
+    project_id: project.project_project_1
 -
   I compute and shedule the tasks.
 -
@@ -12,7 +12,7 @@
   Check if tasks scheduled, check that either of task's start_date, end_date and user_id is not null
 -
   !python {model: project.project}: |
-    prj = self.browse(cr, uid, [ref("project.project_integrate_openerp")])[0]
+    prj = self.browse(cr, uid, [ref("project.project_project_1")])[0]
     for task in prj.tasks:
         if task.state in ('done','cancelled'):
             continue