[MERGE]

bzr revid: nel@tinyerp.com-20100602123620-t2jta52ime913zq3

7 files changed, 85 insertions, 44 deletions

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index b9246508198..95e9099f549 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -84,9 +84,9 @@ class project_phase(osv.osv):
          return True
 
     _columns = {
-        'name': fields.char("Phase Name", size=64, required=True),
-        'date_start': fields.datetime('Starting Date', help="Start date of the phase"),
-        'date_end': fields.datetime('End Date', help="End date of the phase"),
+        'name': fields.char("Name", size=64, required=True),
+        'date_start': fields.datetime('Start Date', help="Starting Date of the phase"),
+        'date_end': fields.datetime('End Date', help="Ending Date of the phase"),
         'constraint_date_start': fields.datetime('Start Date', help='force the phase to start after this date'),
         'constraint_date_end': fields.datetime('End Date', help='force the phase to finish before this date'),
         'project_id': fields.many2one('project.project', 'Project', required=True),
@@ -106,6 +106,7 @@ class project_phase(osv.osv):
         'responsible_id': lambda obj,cr,uid,context: uid,
         'state': 'draft',
         'sequence': 10,
+        'product_uom': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', 'Day')], context=c)[0]
     }
     _order = "name"
     _constraints = [
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 68acf499551..a2ecc604ebe 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -2,6 +2,8 @@
 <openerp>
     <data>
 
+	<menuitem id="menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="1"/>
+
     # ------------------------------------------------------
     # Project Resource Allocation
     # ------------------------------------------------------
@@ -27,11 +29,41 @@
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Project Resource Allocation">
                     <field name="resource_id"/>
+					<field name="phase_id"/>
                     <field name="useability"/>
                 </tree>
             </field>
         </record>
 
+       <record id="view_project_resource_allocation_search" model="ir.ui.view">
+            <field name="name">project.resource.allocation.search</field>
+            <field name="model">project.resource.allocation</field>
+            <field name="type">search</field>
+            <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"/>
+                    </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 string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+       <record id="act_resouce_allocation" model="ir.actions.act_window">
+            <field name="name">Resource Allocations</field>
+            <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="search_view_id" ref="view_project_phase_search"/>-->
+        </record>
+
+
     # ------------------------------------------------------
     # Project Phase
     # ------------------------------------------------------
@@ -47,18 +79,14 @@
                         <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>
                     <notebook colspan="4">
-                        <page string="Resource Allocation Detail">
-                            <group colspan="2" col="2">
-                                <separator colspan="2" string="Duration"/>
-                                <field name="duration" widget="float_time"/>
-                                <field name="product_uom"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator colspan="2" string="Dates"/>
-                                <field name="date_start"/>
-                                <field name="date_end"/>
-                            </group>
+                        <page string="Resource Allocation">
                             <field colspan="4" name="resource_ids" nolabel="1">
                                  <tree editable="bottom" string="Project Resource Allocation">
                                     <field name="resource_id" context="{'project_id':parent.project_id}"/>
@@ -69,6 +97,7 @@
                                     <field name="useability"/>
                                   </form>
                              </field>
+                            <separator string="" colspan="4"/>
                             <group col="12" colspan="4">
                                 <field name="state" select="1"/>
                                 <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
@@ -98,15 +127,8 @@
                             <field colspan="4" name="task_ids" context="{'default_project_id' :project_id}" nolabel="1">
                                  <tree editable="bottom" string="Project's Tasks">
                                     <field name="name"/>
-                                    <field name="project_id"/>
                                     <field name="user_id"/>
-                                    <field name="date_start"/>
-                                      <field name="date_deadline"/>
-                                      <field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
-                                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
-                                    <field name="effective_hours" invisible="1"/>
-                                    <field name="state"/>
-                                    <field name="occupation_rate"/>
+                                    <field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
                                   </tree>
                                   <form string="Project's Tasks">
                                       <notebook colspan="4">
@@ -222,7 +244,7 @@
             <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,gantt</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>
@@ -296,11 +318,17 @@
 
         <menuitem action="act_project_phase"
             groups="base.group_extended"
-            id="menu_project_phase" parent="project.menu_project_management" sequence="4"/>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+            id="menu_project_phase" parent="menu_project_long_term" sequence="4"/>
+
+		<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"/>-->
         <menuitem id="menu_pm_resources_project1"
             groups="base.group_extended"
             name="Resources" parent="base.menu_main_pm" sequence="2"/>
+
+        <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 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"/>
diff --git a/addons/project_long_term/project_long_term_wizard.xml b/addons/project_long_term/project_long_term_wizard.xml
index 98dfabb323e..fa546b9e86f 100644
--- a/addons/project_long_term/project_long_term_wizard.xml
+++ b/addons/project_long_term/project_long_term_wizard.xml
@@ -7,7 +7,7 @@
         <!--<wizard id="wizard_compute_task" model="project.task" menu="False" name="wizard.compute.tasks" string="Compute Task Scheduling"/>-->
 
 		<menuitem icon="terp-project" id="base.menu_main" name="Project Management" sequence="1"/>
-		<menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main" sequence="3"/>
+		<!--<menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main" sequence="3"/>-->
 	<!--	<menuitem
             action="wizard_compute_phase"
             id="menu_wizard_compute_phase"
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 4b4e01a72a9..0a3b2e12336 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -8,16 +8,22 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="Compute Scheduling of Phases">
-		              <field name="target_project" />
-		              <newline />
-		              <group colspan="4" col="6" attrs="{'invisible':[('target_project','=','all')]}">
-		              		<field name="project_id"/>
-		              </group>
-		              <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>
+		              <group height="170" width="500">
+		                  <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>
+			              <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>
+			         </group>
 			  	</form>
             </field>
 		</record>
@@ -34,7 +40,7 @@
     	</record>
 
  		<menuitem id="menu_compute_phase" name="Compute Phase Scheduling"
-        	parent="base.menu_pm_planning" action="action_project_compute_phases"/>
+        	parent="menu_phase_schedule" action="action_project_compute_phases"/>
 
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py
index b86f9d862c9..9f2eb707c60 100644
--- a/addons/project_long_term/wizard/project_compute_tasks.py
+++ b/addons/project_long_term/wizard/project_compute_tasks.py
@@ -136,7 +136,7 @@ class project_compute_tasks(osv.osv_memory):
                                                                          'user_id': user_id[0]},
                                                                          context=ctx)
                 loop_no +=1
-        return {} #improve me => Task Scheduling completed successfully => give this msg at end of wizard
+        return {}
 
 project_compute_tasks()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
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 3b03f20fe1e..c89c83b3058 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -8,7 +8,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="Compute Scheduling of Phases">
-		              <field name="project_id"/>
+	                  <group colspan="4" col="4">
+              		  <label colspan="4" string="This wizard will schedule start date, end date, and assign user to tasks for specified project" />
+              		  <newline />
+		              <field colspan="4" name="project_id"/>
+		              </group>
 		              <group colspan="4" col="6">
 		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
 		            		<button icon="gtk-ok" name="compute_date" string="Compute" type="object"/>
@@ -29,7 +33,7 @@
     	</record>
 
  		<menuitem id="menu_compute_tasks" name="Compute Task Scheduling"
-        	parent="base.menu_pm_planning" action="action_project_compute_tasks"/>
+        	parent="menu_phase_schedule" action="action_project_compute_tasks"/>
 
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/project_long_term/wizard/project_schedule_tasks_view.xml b/addons/project_long_term/wizard/project_schedule_tasks_view.xml
index 1011f366aa5..f17d573185d 100644
--- a/addons/project_long_term/wizard/project_schedule_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_schedule_tasks_view.xml
@@ -8,10 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="Schedule Tasks">
-              		  <label string="Task Scheduling completed successfully."/>
-		              <group colspan="4" col="6">
-		            		<button  icon="gtk-ok" colspan="4" special="cancel" string="_Ok"/>
-		              </group>
+              		  <group height="90" width="250">
+	              		  <label string="Task Scheduling completed successfully."/>
+			              <group colspan="4" col="6">
+			            		<button  icon="gtk-ok" colspan="4" special="cancel" string="_Ok"/>
+			              </group>
+						</group>
 			  	</form>
             </field>
 		</record>