Improvement in project long term

bzr revid: hda@tinyerp.com-20100304101210-evcpjlipc5funitl

1 files changed, 58 insertions, 2 deletions

diff --git a/addons/project_long_term/project_view.xml b/addons/project_long_term/project_view.xml
index 696176fc2f9..059e0a8300a 100644
--- a/addons/project_long_term/project_view.xml
+++ b/addons/project_long_term/project_view.xml
@@ -13,6 +13,7 @@
                 </form>
             </field>
         </record>
+        
         <record id="view_project_resource_allocation_list" model="ir.ui.view">
             <field name="name">project.resource.allocation.list</field>
             <field name="model">project.resource.allocation</field>
@@ -25,6 +26,7 @@
                 </tree>
             </field>
         </record>
+        
         <record id="view_project_phase_form" model="ir.ui.view">
             <field name="name">project.phase.form</field>
             <field name="model">project.phase</field>
@@ -79,8 +81,46 @@
                         </page>
                         <page string="Task Detail">
                             <separator colspan="4" string="Project's Tasks"/>
-                            <field colspan="4" name="task_ids" nolabel="1"/>
-
+                            <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" invisible="1"/>
+                                  </tree>
+                                  <form string="Project's Tasks">
+                                  	<notebook colspan="4">
+                                  		<page string="Task Detail">
+                                  			<group colspan="4" col="4">
+		                                    	<field name="name"/>
+		                                    	<field name="project_id"/>
+		                                    	<field name="user_id"/>
+		                                    </group>
+		                    				<group colspan="2" col="2">
+		                                  		<separator string="Dates" colspan="2"/>
+		                                  		<field name="date_start"/>
+		                                  		<field name="date_deadline"/>
+		                                  		<field name="occupation_rate" invisible="1"/>
+		                                    </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="remaining_hours" widget="float_time" sum="Remaining Hours"/>
+												<field name="effective_hours" invisible="1"/>
+		                                    </group>
+		                                    <group colspan="6" col="4">
+												<field name="state"/>
+											</group>
+										</page>
+									</notebook>
+                                  </form>
+                             </field>
                            	<button name="%(wizard_schedule_task)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
                         </page>
                     </notebook>
@@ -88,6 +128,7 @@
                 </form>
             </field>
         </record>
+        
         <record id="view_project_phase_list" model="ir.ui.view">
             <field name="name">project.phase.list</field>
             <field name="model">project.phase</field>
@@ -212,8 +253,23 @@
         view_mode="tree,form"
         domain="[('phase_id','=',active_id)]"/>
 
+        <act_window
+        domain="[('project_id', '=', active_id)]"
+        id="act_project_phases"
+        name="Phases"
+        res_model="project.phase"
+        src_model="project.project"
+        view_mode="tree,form"
+        view_type="form" />
+
         <menuitem action="act_project_phase" id="menu_project_phase" parent="project.menu_project_management" sequence="4"/>
 
+		<!-- Menu for Resource for Long Term Project -->
+		<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+        <menuitem id="menu_pm_resources_project1" name="Resources" parent="base.menu_main_pm" sequence="2"/>
+		<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"/>
 
     </data>
 </openerp>