[MERGE] Merge with dev-addons3 branch

bzr revid: psi@tinyerp.co.in-20100618052733-kfuqzqr3jq0nj2uq

1 files changed, 39 insertions, 55 deletions

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7eedf814817..8adf603ee75 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="base.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,12 +42,12 @@
             <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">
-                        <filter name="resource" string="Resource" icon="terp-project" domain="[]" context="{'group_by':'resource_id'}"/>
+                        <filter name="resource" string="Resource" icon="terp-folder-blue" domain="[]" context="{'group_by':'resource_id'}"/>
                         <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
@@ -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>
 
@@ -102,7 +102,7 @@
                                 <field name="state" select="1"/>
                                 <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
                                 <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
-                                <button string="Done" name="set_done" states="draft,pending,open" icon="gtk-jump-to"/>
+                                <button string="Done" name="set_done" states="draft,pending,open" icon="gtk-apply"/>
                                 <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
                                 <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                             </group>
@@ -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/>
@@ -218,23 +217,23 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group colspan="4" col="20">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Phases" icon="terp-project" default="1"/>
-                        <filter string="In Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-project"/>
-                        <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-project"/>
+                        <filter string="Draft" domain="[('state','=','draft')]" help="Draft Phases" icon="terp-check" default="1"/>
+                        <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-camera_test"/>
+                        <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">
-                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
+                        <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/>
                     <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'responsible_id'}"/>
-                        <filter string="Start Date" icon="terp-project" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
+                        <filter string="Start Date" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
                     </group>
                 </search>
             </field>
@@ -245,10 +244,20 @@
             <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="search_view_id" ref="view_project_phase_search"/>
+        </record>
+
+        <record id="act_project_phase_list" model="ir.actions.act_window">
+            <field name="name">Project Phases</field>
+            <field name="res_model">project.phase</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar</field>
  			<field name="context">{'search_default_responsible_id':uid}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 
+
     # ------------------------------------------------------
     # Project
     # ------------------------------------------------------
@@ -270,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"
@@ -303,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"
@@ -318,18 +302,18 @@
 
         <menuitem action="act_project_phase"
             groups="base.group_extended"
-            id="menu_project_phase" parent="menu_project_long_term" sequence="4"/>
+            id="menu_project_phase" parent="base.menu_project_long_term" sequence="1"/>
 
-		<menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
-            name="Resource Allocations" parent="menu_project_long_term" />
+        <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
+            name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
 
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+        <!--<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>-->
         <menuitem id="menu_pm_resources_project1"
             groups="base.group_extended"
-            name="Resources" parent="base.menu_main_pm" sequence="2"/>
+            name="Resources" parent="project.menu_definitions" sequence="3"/>
 
-        <menuitem id="menu_phase_schedule" name="Scheduling" parent="menu_project_long_term"/>
-        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="1"/>
+        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4"/>
+        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="project.menu_project_management" sequence="4"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>