pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merged with the trunk

Browse Source 
bzr revid: qdp-launchpad@openerp.com-20120611124211-kf741tkd3gdsp3ep
This commit is contained in:
Quentin (OpenERP)
2012-06-11 14:42:11 +02:00
parent 3692c1dd14 755fc6c38b
commit 204ce4380a
680 changed files with 18364 additions and 169395 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project_long_term/project_long_term_view.xml
+45 -36
View File
@@ -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"/>
@@ -141,7 +141,7 @@
<field name="model">project.phase</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form layout="manual">
<form string="Project Phase" version="7.0">
<header>
<button string="Start Phase" name="set_open" states="pending,draft"/>
<button string="Done" name="set_done" states="pending,open"/>
@@ -150,34 +150,44 @@
<button string="Cancel" name="set_cancel" states="draft,open,pending"/>
<field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</header>
<sheet string="Project Phase" layout="auto">
<group colspan="6" col="6">
<group colspan="6" col="7" >
<field name="name" colspan="4"/>
<field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
<sheet>
<label for="name" class="oe_form_readonly_hidden"/>
<h1><field name="name"/></h1>
<label for="project_id" class="oe_form_readonly_hidden"/>
<h2>
<field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
</h2>
<group>
<group>
<field name="date_start"/>
<field name="date_end"/>
<field name="duration"/>
<field name="product_uom" nolabel="1"/>
</group><group>
<label for="duration"/>
<div>
<field name="duration" class="oe_form_inline"/>
<field name="product_uom"/>
</div>
</group>
</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"/>
@@ -193,24 +203,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>
<field name="constraint_date_start"/>
<field name="constraint_date_end"/>
</group>
<group>
<field name="sequence"/>
</group>
</group>
<group colspan="2" col="2">
<separator string="Displaying Settings" colspan="2"/>
<field name="sequence"/>
</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"/>
<separator string="Previous Phases"/>
<field name="previous_phase_ids"/>
<separator string="Next Phases"/>
<field name="next_phase_ids"/>
</page>
</notebook>
<newline/>
</sheet>
</form>
</field>
@@ -328,7 +337,7 @@
<field name="inherit_id" ref="project.view_task_search_form"/>
<field name="arch" type="xml">
<field name="user_id" position="before">
<field name="phase_id" select="1"/>
<field name="phase_id"/>
</field>
</field>
</record>