[MERGE] Merged with main branch

bzr revid: pso@tinyerp.com-20120822065117-2c81xkcrzacr09wg

6 files changed, 21 insertions, 84 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/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 3b814cbab6e..b4b98e8fe4a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -8,7 +8,6 @@
         <record id="view_project_user_allocation_gantt" model="ir.ui.view">
             <field name="name">project.user.allocation.gantt</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">gantt</field>
             <field name="arch" type="xml">
               <gantt date_start="date_start" date_stop="date_end" default_group_by="user_id">
               </gantt>
@@ -18,7 +17,6 @@
         <record id="view_project_user_allocation_calendar" model="ir.ui.view">
             <field name="name">project.user.allocation.calendar</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_start" date_stop="date_end" day_length="12" string="Users">
@@ -32,7 +30,6 @@
         <record id="view_project_user_allocation_form" model="ir.ui.view">
             <field name="name">project.user.allocation.form</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project User Allocation" version="7.0">
                     <group col="4">
@@ -49,7 +46,6 @@
         <record id="view_project_user_allocation_list" model="ir.ui.view">
             <field name="name">project.user.allocation.list</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Project User Allocation">
@@ -63,7 +59,6 @@
        <record id="view_project_user_allocation_search" model="ir.ui.view">
             <field name="name">project.user.allocation.search</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Planning of Users">
                     <field name="user_id"/>
@@ -99,7 +94,6 @@
         <record id="project_phase_form" model="ir.ui.view">
             <field name="name">Inherit project form : Phase</field>
             <field name="model">project.project</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
@@ -114,7 +108,6 @@
         <record id="view_project_kanban_phase" model="ir.ui.view">
             <field name="name">project.project.kanban.inherited</field>
             <field name="model">project.project</field>
-            <field name="type">kanban</field>
             <field name="inherit_id" ref="project.view_project_kanban"/>
             <field name="arch" type="xml">
                 <field name="use_tasks" position="after">
@@ -131,7 +124,6 @@
         <record id="view_project_phase_form" model="ir.ui.view">
             <field name="name">project.phase.form</field>
             <field name="model">project.phase</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project Phase" version="7.0">
                 <header>
@@ -220,7 +212,6 @@
         <record id="view_project_phase_list" model="ir.ui.view">
             <field name="name">project.phase.list</field>
             <field name="model">project.phase</field>
-            <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancelled','done');blue:state == 'pending'" string="Project Phases">
@@ -237,7 +228,6 @@
         <record id="view_project_phase_calendar" model="ir.ui.view">
             <field name="name">project.phase.calendar</field>
             <field name="model">project.phase</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="project_id" date_start="date_start" date_stop="date_end" day_length="12">
@@ -249,7 +239,6 @@
         <record id="view_project_phase_gantt" model="ir.ui.view">
             <field name="name">project.phase.gantt</field>
             <field name="model">project.phase</field>
-            <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <gantt date_stop="date_end" date_start="date_start" default_group_by="project_id">
@@ -260,7 +249,6 @@
         <record id="view_project_phase_search" model="ir.ui.view">
             <field name="name">project.phase.search</field>
             <field name="model">project.phase</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <field name="name" string="Project Phases"/>
@@ -305,7 +293,6 @@
         <record id="view_phase_task_form2" model="ir.ui.view">
             <field name="name">phase.task.form2</field>
             <field name="model">project.task</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='user_id']" position="after">
@@ -316,7 +303,6 @@
         <record id="view_phase_task_search_form" model="ir.ui.view">
             <field name="name">phase.task.search.form</field>
             <field name="model">project.task</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="before">
@@ -328,7 +314,6 @@
          <record id="view_phase_task_search_form_group" model="ir.ui.view">
             <field name="name">phase.task.search.form.group</field>
             <field name="model">project.task</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
             <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" position="after">
@@ -340,7 +325,6 @@
          <record id="view_phase_task_search_form_tree" model="ir.ui.view">
             <field name="name">phase.task.search.form.tree</field>
             <field name="model">project.task</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="project.view_task_tree2"/>
             <field name="arch" type="xml">
                 <field name="project_id" position="after">
@@ -360,7 +344,6 @@
         <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
             <field name="name">account.analytic.account.phase.form.inherit</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
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
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 0d5c81984ba..c9fcf5aca70 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -5,7 +5,6 @@
         <record id="view_project_compute_phases_select" model="ir.ui.view">
             <field name="name">Schedule Phases</field>
             <field name="model">project.compute.phases</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
                       <group>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index 8eb9db762dd..8b807806cde 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -5,7 +5,6 @@
         <record id="view_project_compute_tasks" model="ir.ui.view">
             <field name="name">Schedule Tasks</field>
             <field name="model">project.compute.tasks</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
                      <group>