[merge] project & project long term demo data

bzr revid: fp@tinyerp.com-20111113141316-nx969ujp66s9d0c5
This commit is contained in:
Fabien Pinckaers 2011-11-13 15:13:16 +01:00
commit 7e785ced6b
5 changed files with 59 additions and 35 deletions

View File

@ -646,6 +646,7 @@ class task(osv.osv):
Close Task
"""
request = self.pool.get('res.request')
if not isinstance(ids,list): ids = [ids]
for task in self.browse(cr, uid, ids, context=context):
vals = {}
project = task.project_id
@ -720,6 +721,7 @@ class task(osv.osv):
return True
def do_open(self, cr, uid, ids, context={}):
if not isinstance(ids,list): ids = [ids]
tasks= self.browse(cr, uid, ids, context=context)
for t in tasks:
data = {'state': 'open'}

View File

@ -166,9 +166,11 @@
<field name="priority">2</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
<field name="name">Develop module in Warehouse</field>
<field name="type_id" ref="project_tt_development"/>
<field name="type_id" ref="project_tt_merge"/>
</record>
<function model="project.task" name="do_close" eval="[ref('project_task_11')]"/>
<record id="project_task_12" model="project.task">
<field eval="20.0" name="planned_hours"/>
<field name="user_id" ref="project.res_users_developer"/>
@ -178,22 +180,27 @@
<field name="type_id" ref="project_tt_development"/>
</record>
<function model="project.task" name="do_close" eval="[ref('project_task_12')]"/>
<record id="project_task_13" model="project.task">
<field eval="50.0" name="planned_hours"/>
<field name="user_id" ref="project.res_users_tester"/>
<field name="priority">2</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
<field name="name">Unit Testing</field>
<field name="type_id" ref="project_tt_testing"/>
<field name="type_id" ref="project_tt_development"/>
</record>
<function model="project.task" name="do_pending" eval="[ref('project_task_13')]"/>
<record id="project_task_14" model="project.task">
<field eval="30.0" name="planned_hours"/>
<field name="user_id" ref="project.res_users_tester"/>
<field name="priority">2</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
<field name="name">Regression Test</field>
<field name="type_id" ref="project_tt_testing"/>
<field name="type_id" ref="project_tt_development"/>
<field name="state">pending</field>
</record>
<record id="project_task_15" model="project.task">
@ -203,6 +210,7 @@
<field name="project_id" ref="project.project_integrate_openerp"/>
<field name="name">Documentation</field>
<field name="type_id" ref="project_tt_specification"/>
<field name="date_start">06-02-2011</field>
</record>
<record id="project_task_16" model="project.task">
@ -212,8 +220,9 @@
<field name="priority">2</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
<field name="name">Performance Tuning</field>
<field name="type_id" ref="project_tt_merge"/>
<field name="type_id" ref="project_tt_specification"/>
</record>
<function model="project.task" name="do_open" eval="[ref('project_task_16')]"/>
<record id="project_task_17" model="project.task">
<field eval="5.0" name="planned_hours"/>
@ -221,8 +230,9 @@
<field name="priority">2</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
<field name="name">Deploy and Review on Customer System</field>
<field name="type_id" ref="project_tt_merge"/>
<field name="type_id" ref="project_tt_specification"/>
</record>
<function model="project.task" name="do_open" eval="[ref('project_task_17')]"/>
<record id="project_task_18" model="project.task">
<field eval="10.0" name="planned_hours"/>
@ -230,7 +240,8 @@
<field name="priority">2</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
<field name="name">Training and Presentation</field>
<field name="type_id" ref="project_tt_merge"/>
<field name="type_id" ref="project_tt_specification"/>
<field name="date_start">09-21-2011</field>
</record>
<!--
@ -286,6 +297,8 @@
<field name="description">BoM, After sales returns, interventions. Traceability.</field>
<field name="name">Specific adaptation to MRP</field>
</record>
<function model="project.task" name="do_open" eval="[ref('project_task_116')]"/>
<record id="project_task_130" model="project.task">
<field name="planned_hours">16.0</field>
<field name="remaining_hours">16.0</field>
@ -294,6 +307,8 @@
<field name="project_id" ref="project_project_23"/>
<field name="name">Data importation + Doc</field>
</record>
<function model="project.task" name="do_open" eval="[ref('project_task_130')]"/>
<record id="project_task_131" model="project.task">
<field name="planned_hours">16.0</field>
<field name="remaining_hours">16.0</field>
@ -302,20 +317,23 @@
<field name="project_id" ref="project_project_23"/>
<field name="name">Modifications asked by the customer.</field>
</record>
<function model="project.task" name="do_open" eval="[ref('project_task_131')]"/>
<record id="project_task_184" model="project.task">
<field name="planned_hours">16.0</field>
<field name="remaining_hours">16.0</field>
<field name="type_id" ref="project_tt_development"/>
<field name="type_id" ref="project_tt_testing"/>
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="priority">0</field>
<field name="project_id" ref="project_project_21"/>
<field name="name">Customer analysis + Architecture</field>
<field name="date_start">12-17-2011</field>
</record>
<record id="project_task_186" model="project.task">
<field name="sequence">15</field>
<field name="planned_hours">8.0</field>
<field name="remaining_hours">8.0</field>
<field name="type_id" ref="project_tt_development"/>
<field name="type_id" ref="project_tt_testing"/>
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="project_id" ref="project_project_21"/>
<field name="name">Internal testing + Software Install</field>
@ -327,20 +345,22 @@
<field name="type_id" ref="project_tt_development"/>
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="priority">2</field>
<field name="state">open</field>
<field name="project_id" ref="project_project_21"/>
<field name="name">Analysis, Data Importation</field>
</record>
<function model="project.task" name="do_open" eval="[ref('project_task_188')]"/>
<record id="project_task_189" model="project.task">
<field name="sequence">20</field>
<field name="planned_hours">16.0</field>
<field name="remaining_hours">16.0</field>
<field name="state">open</field>
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="project_id" ref="project_project_23"/>
<field name="name">Parameters</field>
<field name="type_id" ref="project_tt_specification"/>
</record>
<function model="project.task" name="do_open" eval="[ref('project_task_189')]"/>
<record id="project_task_190" model="project.task">
<field name="sequence">20</field>
<field name="planned_hours">32.0</field>
@ -349,7 +369,8 @@
<field name="state">open</field>
<field name="project_id" ref="project_project_21"/>
<field name="name">Start of the doc redaction + MRP</field>
<field name="type_id" ref="project_tt_specification"/>
<field name="type_id" ref="project_tt_testing"/>
</record>
</data>
</openerp>

View File

@ -6,6 +6,7 @@
-->
<!-- Project Phases -->
<record id="project_phase_1" model="project.phase">
<field eval="[(6, 0, [])]" name="previous_phase_ids"/>
<field name="name">Collect Requirement and Make SRS</field>
@ -15,6 +16,8 @@
<field name="project_id" ref="project.project_integrate_openerp"/>
</record>
<function model="project.phase" name="set_open" eval="[ref('project_phase_1')]"/>
<record id="project_phase_2" model="project.phase">
<field eval="[(6, 0, [ref('project_phase_1')])]" name="previous_phase_ids"/>
<field name="name">Design Model</field>
@ -23,7 +26,8 @@
<field name="duration">20</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
</record>
<function model="project.phase" name="set_open" eval="[ref('project_phase_2')]"/>
<record id="project_phase_3" model="project.phase">
<field eval="[(6, 0, [ref('project_phase_2')])]" name="previous_phase_ids"/>
<field name="name">Planning and compute Risk analysis, Time chart </field>
@ -32,7 +36,8 @@
<field name="duration">20</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
</record>
<function model="project.phase" name="set_open" eval="[ref('project_phase_3')]"/>
<record id="project_phase_4" model="project.phase">
<field eval="[(6, 0, [ref('project_phase_2')])]" name="previous_phase_ids"/>
<field name="name">Development and Integration</field>
@ -60,6 +65,7 @@
<field name="project_id" ref="project.project_integrate_openerp"/>
</record>
<function model="project.phase" name="set_open" eval="[ref('project_phase_6')]"/>
<!-- Tasks -->
<record id="project.project_task_1" model="project.task">

View File

@ -300,9 +300,9 @@
<field name="type">form</field>
<field name="inherit_id" ref="project.view_task_form2"/>
<field name="arch" type="xml">
<field name="sequence" position="after">
<xpath expr="//field[@name='effective_hours']" position="after">
<field name="phase_id"/>
</field>
</xpath>
</field>
</record>
<record id="view_phase_task_search_form" model="ir.ui.view">
@ -324,7 +324,7 @@
<field name="inherit_id" ref="project.view_task_search_form"/>
<field name="arch" type="xml">
<filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" position="after">
<filter string="Project Phase" name="group_project_id_phase" icon="terp-folder-violet" domain="[]" context="{'group_by':'phase_id'}" groups="base.group_extended"/>
<filter string="Project Phase" name="group_project_id_phase" icon="terp-folder-violet" domain="[]" context="{'group_by':'phase_id'}" groups="base.group_extended"/>
</filter>
</field>
</record>
@ -342,22 +342,20 @@
</record>
<act_window
context="{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}"
id="project_phase_task_list"
name="Related Tasks"
res_model="project.task"
src_model="project.phase"
view_mode="tree,form"
context="{'search_default_phase_id': [active_id]}"
domain="[('phase_id', '=', active_id),('project_id','=',project_id)]"
/>
<act_window
context="{'search_default_project_id': [active_id]}"
context="{'search_default_project_id': active_id, 'default_project_id': active_id}"
id="act_project_phases"
name="Phases"
res_model="project.phase"
src_model="project.project"
domain="[('project_id', '=', active_id)]"
view_mode="tree,form"
view_type="form"
/>
@ -367,12 +365,10 @@
# ------------------------------------------------------
<menuitem action="act_project_phase_list"
groups="base.group_extended"
id="menu_project_phase_list" parent="project.menu_project_management" sequence="2"/>
<menuitem action="act_project_phase"
icon="STOCK_INDENT"
groups="base.group_extended"
id="menu_project_phase" parent="base.menu_project_long_term" sequence="1"/>
<menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
@ -385,8 +381,8 @@
<menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager"/>
<menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_users_project1" sequence="2"/>
<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_users_project1" sequence="1"/>
<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_users_project1" sequence="1"/>
<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_users_project1" sequence="5"/>
<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_users_project1" sequence="3"/>
</data>
</openerp>

View File

@ -106,6 +106,7 @@
<field name="view_mode">tree,form</field>
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_resource_calendar_search"/>
<field name="help">Define working hours and time table that could be scheduled to your project members</field>
</record>
<record id="view_resource_calendar_attendance_tree" model="ir.ui.view">
@ -170,19 +171,17 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Resource">
<group colspan="4" col="6">
<field name="name" colspan="4"/>
<field name="active"/>
<field name="resource_type" />
<field name="user_id" attrs="{'required':[('resource_type','=','user')], 'readonly':[('resource_type','=','material')]}"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<notebook colspan="4">
<page string="General Information">
<group col="6" colspan="4">
<field name="name" colspan="4"/>
<field name="active"/>
<newline/>
<field name="user_id" attrs="{'required':[('resource_type','=','user')], 'readonly':[('resource_type','=','material')]}"/>
<field name="resource_type" />
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<newline/>
<field name="calendar_id" string="Working Period"/>
<field name="time_efficiency" groups="base.group_extended"/>
</page>
</notebook>
</group>
</form>
</field>
</record>