[Merge]: Merge with lp:openobject-addons

bzr revid: jas@tinyerp.com-20100929064228-a5ddx93f8f08ybmu

1 files changed, 34 insertions, 25 deletions

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index ee763b759b6..a3ff3b39669 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -30,7 +30,7 @@
                 <form string="Project Resource Allocation">
                     <field name="resource_id" select="1"/>
                     <field name="phase_id"/>
-                    <field name="useability"/>
+                    <field name="useability" string="Availability"/>
                 </form>
             </field>
         </record>
@@ -60,8 +60,9 @@
                         <field name="phase_id"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter name="resource" string="Resource" icon="terp-folder-blue" domain="[]" context="{'group_by':'resource_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
@@ -89,16 +90,21 @@
             <field name="arch" type="xml">
                 <form string="Project Phase">
                     <group colspan="6" col="6">
-                        <field name="name" select="1"/>
-                        <field name="project_id" on_change="onchange_project(project_id)"/>
-                        <field name="responsible_id"/>
-                    </group>
-                    <group colspan="6" col="6">
-                        <field name="duration" />
-                        <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                    </group>
+	                    <group colspan="2" col="2">
+	                        <field name="name" select="1"/>
+	                        <field name="date_start"/>
+	                    </group>
+	                    <group colspan="2" col="4">
+	                       <field name="project_id" on_change="onchange_project(project_id)" colspan="4"/>
+                           <newline/>
+	                       <field name="duration" colspan="1"/>
+                           <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
+	                    </group>
+	                    <group colspan="2" col="2">
+	                       <field name="responsible_id"/>
+	                       <field name="date_end"/>
+                    	</group>
+					</group>
                     <notebook colspan="4">
                         <page string="Resource Allocation">
                             <field colspan="4" name="resource_ids" nolabel="1">
@@ -115,9 +121,9 @@
                             <group col="12" colspan="4">
                                 <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="pending,open" icon="gtk-apply"/>
                                 <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
+                                <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/>
+                                <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
                                 <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -184,7 +190,7 @@
             <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
-                <tree string="Project Phases">
+                <tree colors="grey:state in ('cancelled','done');blue:state in ('pending')" string="Project Phases">
                     <field name="name"/>
                     <field name="project_id" on_change="onchange_project(project_id)"/>
                     <field name="responsible_id"/>
@@ -228,23 +234,26 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group colspan="4" col="20">
-                        <filter string="Draft" domain="[('state','=','draft')]" help="Draft Phases" icon="terp-check" default="1"/>
+                        <filter string="Draft" domain="[('state','=','draft')]" help="Draft Phases" icon="terp-document-new" 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">
-                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/>
+                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                         </field>
                         <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-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <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'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}" name="project"/>
+                        <separator orientation="vertical"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Start Month"/>
                     </group>
                 </search>
             </field>
@@ -257,7 +266,7 @@
             <field name="view_mode">tree,form,gantt,calendar</field>
             <field name="context">{'search_default_responsible_id':uid}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
-            <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>            
+            <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>
         </record>
 
         <record id="act_project_phase_list" model="ir.actions.act_window">
@@ -297,10 +306,10 @@
         res_model="project.task"
         src_model="project.phase"
         view_mode="tree,form"
-        domain="[('phase_id','=',active_id)]"/>
+        context="{'search_default_phase_id': [active_id]}"/>
 
     <act_window
-        domain="[('project_id', '=', active_id)]"
+    	context="{'search_default_project_id': [active_id]}"
         id="act_project_phases"
         name="Phases"
         res_model="project.phase"
@@ -320,7 +329,7 @@
             name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_resources_project1"
-            groups="base.group_extended"  
+            groups="base.group_extended"
             name="Resources" parent="project.menu_definitions" sequence="3"/>
 
         <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system"/>