[Merge]: Merge with trunk addons

bzr revid: rpa@openerp.co.in-20100305084917-dlaaj2fkcv9kfhko

4 files changed, 74 insertions, 4 deletions

diff --git a/addons/project_long_term/__terp__.py b/addons/project_long_term/__terp__.py
index 80c9a9d98b7..44a15c5a679 100644
--- a/addons/project_long_term/__terp__.py
+++ b/addons/project_long_term/__terp__.py
@@ -32,6 +32,7 @@
     "init_xml" : [],
     "demo_xml" : ["project_demo.xml"],
     "update_xml": [
+        'security/ir.model.access.csv',
         "project_wizard.xml" ,
         "project_view.xml",
         "project_phase_workflow.xml"
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>
diff --git a/addons/project_long_term/project_wizard.xml b/addons/project_long_term/project_wizard.xml
index 05d4d1f3e0f..c61a1042003 100644
--- a/addons/project_long_term/project_wizard.xml
+++ b/addons/project_long_term/project_wizard.xml
@@ -4,6 +4,7 @@
         <wizard id="wizard_compute_phase" menu="False" model="project.phase" name="wizard.compute.phases" string="Compute Phase Scheduling"/>
         <wizard id="wizard_schedule_task" menu="False" model="project.phase" name="phase.schedule.tasks" string="Schedule Tasks"/>
         <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
             action="wizard_compute_phase"
diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py
index 0ad554f3122..54051b521e2 100644
--- a/addons/project_long_term/wizard/compute_phases_date.py
+++ b/addons/project_long_term/wizard/compute_phases_date.py
@@ -128,6 +128,17 @@ class wizard_compute_phases(wizard.interface):
             phase_schedule(cr, uid, phase, start_dt, calendar_id or False)
         return {}
 
+    def phases_open_list(self, cr, uid, data, context):
+        mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
+        act_obj = pooler.get_pool(cr.dbname).get('ir.actions.act_window')
+        result = mod_obj._get_id(cr, uid, 'project_long_term', 'act_project_phase')
+        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
+        result = act_obj.read(cr, uid, [id], context=context)[0]
+        if data['form']['project_id']:
+            result['domain'] = [('project_id', '=', data['form']['project_id'])]
+        result['domain'] = [('state', 'not in', ['cancelled','done'])]
+        return result
+
     states = {
         'init': {
             'actions': [],
@@ -139,9 +150,10 @@ class wizard_compute_phases(wizard.interface):
         },
         'compute': {
             'actions': [_compute_date],
-            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok')]},
-        }
+            'result': {'type': 'action', 'action':phases_open_list, 'state':'end'},
+        },
     }
+
 wizard_compute_phases('wizard.compute.phases')