summaryrefslogtreecommitdiff
path: root/addons/project_long_term/project_long_term_view.xml
diff options
context:
space:
mode:
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
-rw-r--r--addons/project_long_term/project_long_term_view.xml180
1 files changed, 102 insertions, 78 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 02412a20a1f..a98e9088402 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -37,8 +37,8 @@
<field name="model">project.user.allocation</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Project User Allocation">
- <group colspan="4" col="6">
+ <form string="Project User Allocation" version="7.0">
+ <group col="4">
<field name="user_id"/>
<field name="phase_id"/>
<field name="project_id"/>
@@ -70,16 +70,16 @@
<field name="arch" type="xml">
<search string="Planning of Users">
<group>
- <field name="user_id"/>
- <field name="phase_id"/>
- <field name="project_id"/>
+ <field name="user_id"/>
+ <field name="phase_id"/>
+ <field name="project_id"/>
</group>
<newline/>
<group expand="0" string="Group By...">
- <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
- <separator orientation="vertical"/>
- <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'}"/>
+ <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+ <separator orientation="vertical"/>
+ <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>
@@ -97,6 +97,13 @@
# ------------------------------------------------------
# Project Phase
# ------------------------------------------------------
+ <act_window id="act_project_phases"
+ name="Phases"
+ src_model="project.project"
+ res_model="project.phase"
+ view_type="form"
+ view_mode="tree,form"
+ context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
<record id="project_phase_form" model="ir.ui.view">
<field name="name">Inherit project form : Phase</field>
@@ -104,21 +111,15 @@
<field name="type">form</field>
<field name="inherit_id" ref="project.edit_project"/>
<field name="arch" type="xml">
- <field name="use_tasks" position="after">
- <field name="use_phases"/>
- </field>
+ <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+ <tr>
+ <td><group><field name="use_phases"/></group></td>
+ <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
+ </tr>
+ </xpath>
</field>
</record>
- <act_window id="act_project_phases"
- name="Phases"
- src_model="project.project"
- res_model="project.phase"
- view_type="form"
- view_mode="tree,form"
- context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
- />
-
<record id="view_project_kanban_phase" model="ir.ui.view">
<field name="name">project.project.kanban.inherited</field>
<field name="model">project.project</field>
@@ -129,58 +130,65 @@
<field name="use_phases"/>
<field name="phase_count"/>
</field>
- <xpath expr="//div[@id='list']" position="inside">
- <a t-if="record.use_phases.raw_value" class="oe_project_buttons"
- id="4" name="%(act_project_phases)d" type="action">Phases(<field name="phase_count"/>)</a>
+ <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
+ <a t-if="record.use_phases.raw_value"
+ name="%(act_project_phases)d" type="action">Phases(<field name="phase_count"/>)</a>
</xpath>
</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>
<field name="type">form</field>
<field name="arch" type="xml">
- <form layout="manual">
- <div class="oe_form_topbar">
- <button string="Start Phase" name="set_open" states="pending,draft"/>
+ <form string="Project Phase" version="7.0">
+ <header>
+ <button string="Start Phase" name="set_open" states="pending,draft" class="oe_highlight"/>
<button string="Done" name="set_done" states="pending,open"/>
<button string="Pending" name="set_pending" states="open"/>
<button string="Draft" name="set_draft" states="open"/>
<button string="Cancel" name="set_cancel" states="draft,open,pending"/>
- <div class="oe_right">
- <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
- </div>
- <div class="oe_clear"/>
- </div>
- <sheet string="Project Phase" layout="auto">
- <group colspan="6" col="6">
- <group colspan="6" col="7" >
- <field name="name" colspan="4"/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+ </header>
+ <sheet>
+ <div class="oe_title">
+ <label for="name" class="oe_edit_only"/>
+ <h1><field name="name"/></h1>
+ <label for="project_id" class="oe_edit_only"/>
+ <h2>
<field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
- <field name="date_start"/>
- <field name="date_end"/>
- <field name="duration"/>
- <field name="product_uom" nolabel="1"/>
- </group>
+ </h2>
+ </div>
+ <group>
+ <label for="date_start" string="Duration"/>
+ <div>
+ <div>
+ <field name="duration" class="oe_inline"/>
+ <field name="product_uom" class="oe_inline"/>
+ </div>
+ <field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
+ </div>
</group>
- <notebook colspan="4">
+ <notebook>
<page string="Planning of Users">
- <field colspan="4" name="user_ids" nolabel="1">
+ <field name="user_ids">
<tree editable="bottom" string="Project Users">
- <field name="user_id"/>
- <field name="date_start"/>
- <field name="date_end"/>
+ <field name="user_id"/>
+ <field name="date_start"/>
+ <field name="date_end"/>
</tree>
- <form string="Project Users">
- <field name="user_id"/>
- <field name="date_start" />
- <field name="date_end"/>
+ <form string="Project Users" version="7.0">
+ <group col="4">
+ <field name="user_id"/>
+ <field name="date_start" />
+ <field name="date_end"/>
+ </group>
</form>
</field>
</page>
<page string="Tasks Details">
- <field colspan="4" name="task_ids" readonly="1" context="{'default_project_id' :project_id}" nolabel="1">
+ <field name="task_ids" readonly="1" context="{'default_project_id' :project_id}">
<tree string="Project's Tasks">
<field name="sequence"/>
<field name="name"/>
@@ -196,24 +204,23 @@
</field>
</page>
<page string="Constraints">
- <group colspan="2" col="2">
- <separator string="Constraints" colspan="2"/>
- <field name="constraint_date_start"/>
- <field name="constraint_date_end"/>
- </group>
- <group colspan="2" col="2">
- <separator string="Displaying Settings" colspan="2"/>
- <field name="sequence"/>
+ <group>
+ <group>
+ <field name="constraint_date_start"/>
+ <field name="constraint_date_end"/>
+ </group>
+ <group>
+ <field name="sequence"/>
+ </group>
</group>
- <separator colspan="4" string="Force Assigned Users"/>
- <field colspan="4" name="user_force_ids" nolabel="1"/>
- <separator colspan="4" string="Previous Phases"/>
- <field colspan="4" name="previous_phase_ids" nolabel="1"/>
- <separator colspan="4" string="Next Phases"/>
- <field colspan="4" name="next_phase_ids" nolabel="1"/>
+ <separator string="Force Assigned Users"/>
+ <field name="user_force_ids" widget="many2many_tags" />
+ <separator string="Previous Phases"/>
+ <field name="previous_phase_ids"/>
+ <separator string="Next Phases"/>
+ <field name="next_phase_ids"/>
</page>
</notebook>
- <newline/>
</sheet>
</form>
</field>
@@ -266,22 +273,23 @@
<field name="arch" type="xml">
<search string="Project Phases">
<group>
+ <field name="name" string="Project Phases"/>
+ <separator orientation="vertical"/>
+ <field name="date_start"/>
+ <field name="date_end"/>
+ <separator orientation="vertical"/>
<filter string="New" domain="[('state','=','draft')]" name="current" help="New 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"/>
+ <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
<separator orientation="vertical"/>
- <field name="name"/>
- <field name="project_id">
- <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
- </field>
- <field name="date_start"/>
- <field name="date_end"/>
+ <field name="project_id"/>
</group>
- <newline/>
+ <newline/>
<group expand="0" string="Group By...">
<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'}"/>
+ <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Start Month"/>
</group>
@@ -330,8 +338,8 @@
<field name="type">search</field>
<field name="inherit_id" ref="project.view_task_search_form"/>
<field name="arch" type="xml">
- <field name="project_id" position="after">
- <field name="phase_id" select="1"/>
+ <field name="user_id" position="before">
+ <field name="phase_id"/>
</field>
</field>
</record>
@@ -369,6 +377,22 @@
view_mode="tree,form"
/>
+ <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
+ <field name="name">account.analytic.account.phase.form.inherit</field>
+ <field name="model">account.analytic.account</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+ <field eval="18" name="priority"/>
+ <field name="arch" type="xml">
+ <xpath expr='//separator[@name="project_sep"]' position='replace'>
+ <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
+ </xpath>
+ <xpath expr='//separator[@name="project_sep"]' position='after'>
+ <field name="use_phases"/>
+ </xpath>
+ </field>
+ </record>
+
# ------------------------------------------------------
# Menu Items
# ------------------------------------------------------
@@ -385,7 +409,7 @@
parent="base.menu_project_long_term" sequence="2"/>
<menuitem id="menu_pm_users_project1"
- name="Resources" parent="project.menu_definitions" sequence="3"/>
+ name="Resources" parent="base.menu_definitions" sequence="3"/>
<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"/>