[MERGE]

bzr revid: hmo@tinyerp.com-20100831101152-pxx8ef3lpyfq4flz

4 files changed, 32 insertions, 32 deletions

diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index c98c85006fa..0d03b5f7315 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -27,14 +27,14 @@
     "category": "Generic Modules/Projects & Services",
     "depends": ["resource", "project"],
     "description": """
-
-        Long Term Project management module that tracks planning, scheduling, resources allocation.
-        Mainly used with Big project management.
-            - Project Phases will be maintained by Manager of the project
-            - Compute Phase Scheduling: Compute start date and end date of the phases which are in draft,open and pending state of the project given.
-                                        If no project given then all the draft,open and pending state phases will be taken
-            - Compute Task Scheduling: This works same as the scheduler button on project.phase. It takes the project as argument and computes all the open,draft and pending tasks
-            - Schedule Tasks: All the tasks which are in draft,pending and open state are scheduled with taking the phase's start date
+Long Term Project management module that tracks planning, scheduling, resources allocation.
+Features.
+    - Manage Big project.
+    - Define various Phases of Project.
+    - Compute Phase Scheduling: Compute start date and end date of the phases which are in draft,open and pending state of the project given.
+      If no project given then all the draft,open and pending state phases will be taken
+    - Compute Task Scheduling: This works same as the scheduler button on project.phase. It takes the project as argument and computes all the open,draft and pending tasks
+    - Schedule Tasks: All the tasks which are in draft,pending and open state are scheduled with taking the phase's start date
 
     """,
     "init_xml": [],
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 4b25ede2aa7..ee763b759b6 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -72,9 +72,9 @@
             <field name="name">Resource Allocations</field>
             <field name="res_model">project.resource.allocation</field>
             <field name="view_type">form</field>
-            <field name="view_mode">gantt,tree,form</field>
+            <field name="view_mode">tree,form,gantt</field>
              <field name="context">{}</field>
-            <!--<field name="search_view_id" ref="view_project_phase_search"/>-->
+            <field name="search_view_id" ref="view_project_resource_allocation_search"/>
         </record>
 
 
@@ -254,7 +254,7 @@
             <field name="name">Project Phases</field>
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
-            <field name="view_mode">gantt,tree,form,calendar</field>
+            <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>            
@@ -314,13 +314,13 @@
 
         <menuitem action="act_project_phase"
             groups="base.group_extended"
-            id="menu_project_phase" parent="base.menu_project_long_term" sequence="1"/>
+            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="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"/>
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 3895b0cc4c8..8818684e8fa 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -8,20 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="Compute Scheduling of Phases">
-              		<group width="380" height="180">
-                        <group colspan="4" col="4">
-                            <label colspan="4" string="This wizard will schedule phases for all or specified project" />
-                            <newline />
-                            <field name="target_project" colspan="4"/>
-		                </group>
-                        <newline />
-                        <group colspan="4" col="6" attrs="{'invisible':[('target_project','=','all')]}">
-                            <field name="project_id"/>
-                        </group>
+                    <group colspan="4" col="4">
+                        <separator colspan="4" string="Compute Scheduling of phases for all or specified project" />
+                        <field name="target_project" colspan="4"/>
+                        <field name="project_id" widget="selection" colspan="4" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
                         <separator colspan="4"/>
-                        <group colspan="4" col="6"> <!-- Improve me -->
-	                        <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-	                        <button icon="gtk-ok" name="check_selection" string="_Compute" type="object"/>
+                        <group colspan="2" col="2">
+                        </group>
+                        <group colspan="2" col="2"> <!-- Improve me -->
+	                        <button  icon="gtk-close" special="cancel" string="_Close"/>
+	                        <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
                         </group>
 		            </group>
 			  	</form>
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 bf6fe379048..e0cd30d5622 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -7,12 +7,16 @@
             <field name="model">project.compute.tasks</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              	<form string="Compute Scheduling of Phases">
-	                <group colspan="4" height="100" width="500">
-                        <field name="project_id"/>
-                        <group colspan="4" col="6">
-                            <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-		            	    <button icon="gtk-ok" name="compute_date" string="Compute" type="object"/>
+              	<form string="Compute Scheduling of Task">
+	                <group colspan="4">
+ 					    <separator colspan="4" string="Compute Scheduling of Task for specified project." />	                
+                        <field name="project_id" widget="selection" colspan="4"/>
+                        <separator colspan="4"/>
+                        <group colspan="2" col="2">
+                        </group>
+                        <group colspan="2" col="2">
+                            <button  icon="gtk-close" special="cancel" string="_Close"/>
+		            	    <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
 		              </group>
 		            </group>
 			  	</form>