<field name="model">project.resource.allocation</field>
<field name="type">gantt</field>
<field name="arch" type="xml">
- <gantt color="phase_id" date_start="date_start" date_stop="date_end" string="R.A." mode="year">
+ <gantt color="project_id" date_start="date_start" date_stop="date_end" mode="year">
<level object="res.users" link="user_id" domain="[]">
- <field name="useability" string="Availability"/>
+ <field name="name"/>
</level>
</gantt>
</field>
<field name="type">calendar</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
- <calendar color="user_id" date_start="date_start" date_stop="date_end" day_length="12" string="Resources">
+ <calendar color="resource_id" date_start="date_start" date_stop="date_end" day_length="12" string="Resources">
<field name="phase_id"/>
<field name="project_id"/>
</calendar>
<field name="model">project.resource.allocation</field>
<field name="type">search</field>
<field name="arch" type="xml">
- <search string="Resource Allocations">
+ <search string="Resources Allocation">
<group colspan="4" col="20">
<field name="resource_id"/>
<field name="phase_id"/>
<group expand="0" string="Group By..." colspan="4" col="20">
<filter name="resource" string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
<separator orientation="vertical"/>
- <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+ <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_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="name">Resources Allocation</field>
<field name="res_model">project.resource.allocation</field>
<field name="view_type">form</field>
<field name="view_mode">gantt,tree,form,calendar</field>
<field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
<field name="date_end"/>
</group>
- </group>
+ </group>
<notebook colspan="4">
<page string="Resource Allocation">
<field colspan="4" name="resource_ids" nolabel="1">
<separator string="" colspan="4"/>
<group col="12" colspan="4">
<field name="state" select="1"/>
+ <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
<button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
<button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
<button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/>
<button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
- <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
</group>
</page>
<page string="Task Detail">
<field name="type">calendar</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
- <calendar color="responsible_id" date_start="date_start" date_stop="date_end" day_length="12" string="Phases">
+ <calendar color="project_id" date_start="date_start" date_stop="date_end" day_length="12">
<field name="name"/>
- <field name="project_id"/>
+ <field name="responsible_id"/>
</calendar>
</field>
</record>
<field name="type">gantt</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
- <gantt color="responsible_id" date_stop="date_end" date_start="date_start" string="Phases">
+ <gantt color="project_id" date_stop="date_end" date_start="date_start" mode="month">
<level object="project.project" link="project_id" domain="[]">
<field name="name"/>
</level>
<field name="arch" type="xml">
<search string="Project Phases">
<group colspan="4" col="20">
- <filter string="Draft" domain="[('state','=','draft')]" help="Draft Phases" icon="terp-document-new" default="1"/>
- <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-camera_test"/>
+ <filter string="Current" domain="[('state','in',('open','draft'))]" name="current" help="Draft and In Progress Phases" icon="terp-check"/>
+ <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
<filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="project_id">
- <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
+ <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
</field>
<field name="responsible_id"/>
<field name="date_start"/>
<group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
<separator orientation="vertical"/>
- <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}" name="project"/>
+ <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
<separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<field name="res_model">project.phase</field>
<field name="view_type">form</field>
<field name="view_mode">gantt,tree,form,calendar</field>
- <field name="context">{'search_default_responsible_id':uid,'group_by':'project_id'}</field>
+ <field name="context">{"search_default_current": 1}</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>
+ <field name="help">A project can be split into the different phases. For each phase, you can define your resources allocation, describe different tasks and link your phase to previous and next ones, add date constraints for the automated scheduling. Use the long term planning in order to planify your available human resources, convert your phases into a series of tasks when you start working on it.</field>
</record>
<record id="act_project_phase_list" model="ir.actions.act_window">
<field name="res_model">project.phase</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
- <field name="context">{'search_default_responsible_id':uid,'group_by':'project_id'}</field>
+ <field name="context">{"search_default_current": 1}</field>
<field name="search_view_id" ref="view_project_phase_search"/>
</record>
# Project
# ------------------------------------------------------
- <record id="view_phase_project_form1" model="ir.ui.view">
- <field name="name">phase.project.form1</field>
+ <record id="project.view_project_resource_form1" model="ir.ui.view">
+ <field name="name">Project Resource Calendar View</field>
<field name="model">project.project</field>
<field name="type">form</field>
<field name="inherit_id" ref="project.edit_project"/>
</field>
</record>
+ <record id="view_phase_task_search_form_group" model="ir.ui.view">
+ <field name="name">phase.task.search.form.group</field>
+ <field name="model">project.task</field>
+ <field name="type">search</field>
+ <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>
+ </field>
+ </record>
+
+ <record id="view_phase_task_search_form_tree" model="ir.ui.view">
+ <field name="name">phase.task.search.form.tree</field>
+ <field name="model">project.task</field>
+ <field name="type">tree</field>
+ <field name="inherit_id" ref="project.view_task_tree2"/>
+ <field name="arch" type="xml">
+ <field name="project_id" position="after">
+ <field name="phase_id" invisible="1" groups="base.group_extended"/>
+ </field>
+ </field>
+ </record>
+
<act_window
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]}"/>
+ 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]}"
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"
+ />
+
+ <act_window
+ context="{'search_default_user_id': [user_id]}"
+ id="act_project_resource"
+ name="Resources"
+ res_model="resource.resource"
+ src_model="project.project"
+ domain="[('user_id', '=',user_id)]"
view_mode="tree,form"
- view_type="form" />
+ view_type="form"
+ />
# ------------------------------------------------------
# Menu Items
# ------------------------------------------------------
+ <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"
+ icon="STOCK_INDENT"
name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
<menuitem id="menu_pm_resources_project1"
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"/>
- <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="project.menu_project_management" sequence="4"/>
+ <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_resources_project1" sequence="2"/>
<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"/>
projects / odoo / odoo.git / blobdiff