[MERGE] merge with trunk

bzr revid: mra@mra-laptop-20100614044510-iffai5yviiknzqfa

1 files changed, 14 insertions, 40 deletions

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 92b8a34ee9c..583822ccb8d 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-	<menuitem id="menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="1"/>
+    <menuitem id="menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="1"/>
 
     # ------------------------------------------------------
     # Project Resource Allocation
@@ -29,7 +29,7 @@
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Project Resource Allocation">
                     <field name="resource_id"/>
-					<field name="phase_id"/>
+                    <field name="phase_id"/>
                     <field name="useability"/>
                 </tree>
             </field>
@@ -42,8 +42,8 @@
             <field name="arch" type="xml">
                 <search string="Resource Allocations">
                     <group colspan="4" col="20">
-                        <field name="resource_id" widget="selection"/>
-                        <field name="phase_id" widget="selection"/>
+                        <field name="resource_id"/>
+                        <field name="phase_id"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="20">
@@ -59,7 +59,7 @@
             <field name="res_model">project.resource.allocation</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
- 			<field name="context">{'search_default_resource': 1} </field>
+             <field name="context">{'search_default_resource': 1} </field>
             <!--<field name="search_view_id" ref="view_project_phase_search"/>-->
         </record>
 
@@ -128,7 +128,7 @@
                                  <tree editable="bottom" string="Project's Tasks">
                                     <field name="name"/>
                                     <field name="user_id"/>
-                                    <field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
+                                    <field name="planned_hours" widget="float_time"/>
                                   </tree>
                                   <form string="Project's Tasks">
                                       <notebook colspan="4">
@@ -142,11 +142,10 @@
                                                   <separator string="Dates" colspan="2"/>
                                                   <field name="date_start"/>
                                                   <field name="date_deadline"/>
-                                                  <field name="occupation_rate"/>
                                             </group>
                                             <group colspan="2" col="2">
                                                   <separator string="Planning" colspan="2"/>
-                                                  <field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
+                                                  <field name="planned_hours" widget="float_time"/>
                                                 <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
                                                 <field name="effective_hours" invisible="1"/>
                                             </group>
@@ -157,7 +156,7 @@
                                     </notebook>
                                   </form>
                              </field>
-                           	<button name="%(action_project_schedule_tasks)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
+                               <button name="%(action_project_schedule_tasks)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
                         </page>
                     </notebook>
                     <newline/>
@@ -223,10 +222,10 @@
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="project_id" widget="selection">
+                        <field name="project_id">
                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/>
                         </field>
-                        <field name="responsible_id" widget="selection"/>
+                        <field name="responsible_id"/>
                         <field name="date_start"/>
                     </group>
                     <newline/>
@@ -245,7 +244,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
- 			<field name="context">{'search_default_responsible_id':uid}</field>
+             <field name="context">{'search_default_responsible_id':uid}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 
@@ -280,32 +279,7 @@
     # Project Task
     # ------------------------------------------------------
 
-        <record id="view_project_phase_task_form1" model="ir.ui.view">
-            <field name="name">project.phase.task.form1</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">
-                <field name="planned_hours" position="replace">
-                    <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours, date_start, occupation_rate)"/>
-                </field>
-
-            </field>
-       </record>
-
-        <record id="view_project_phase_task_form2" model="ir.ui.view">
-            <field name="name">project.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">
-                <field name="date_end" position = "after">
-                      <field name="occupation_rate"/>
-                </field>
-            </field>
-       </record>
-
-        <act_window
+    <act_window
         id="project_phase_task_list"
         name="Related Tasks"
         res_model="project.task"
@@ -313,7 +287,7 @@
         view_mode="tree,form"
         domain="[('phase_id','=',active_id)]"/>
 
-        <act_window
+    <act_window
         domain="[('project_id', '=', active_id)]"
         id="act_project_phases"
         name="Phases"
@@ -330,7 +304,7 @@
             groups="base.group_extended"
             id="menu_project_phase" parent="menu_project_long_term" sequence="4"/>
 
-		<menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
+        <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
             name="Resource Allocations" parent="menu_project_long_term" />
 
         <!--<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>-->