summaryrefslogtreecommitdiff
path: root/addons/project_long_term/project_long_term_view.xml
diff options
context:
space:
mode:
authorSbh (OpenERP) <sbh@tinyerp.com>2010-12-31 10:29:26 +0530
committerSbh (OpenERP) <sbh@tinyerp.com>2010-12-31 10:29:26 +0530
commita329a57bdde3ca4006a1fea853c2cde49b90aa40 (patch)
tree7ca3a5b3ff097185d5e275a195012c2df1141941 /addons/project_long_term/project_long_term_view.xml
parentacf9c6417981c09f7a7f12fe5423705c542e623f (diff)
parentf8c4b4e72ffea7448648cb1b5e4e5576c9cfa970 (diff)
[MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101230131110-8l42t3b4hituf7aj bzr revid: sbh@tinyerp.com-20101231045926-gqkspd1jgoglv2qj
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
-rw-r--r--addons/project_long_term/project_long_term_view.xml27
1 files changed, 15 insertions, 12 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 37813f84946..7eaed6e120c 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -63,7 +63,7 @@
<field name="resource_id"/>
<field name="phase_id"/>
<field name="project_id"/>
- <field name="useability"/>
+ <field name="useability" string="Availability"/>
</tree>
</field>
</record>
@@ -117,7 +117,7 @@
</group>
<group colspan="6" col="6">
<field name="date_start"/>
- <field name="duration" on_change="onchange_days(project_id)" />
+ <field name="duration"/>
<field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
<field name="date_end"/>
</group>
@@ -127,15 +127,15 @@
<field colspan="4" name="resource_ids" nolabel="1">
<tree editable="bottom" string="Project Resource Allocation">
<field name="resource_id" context="{'project_id':parent.project_id}"/>
- <field name="date_start"/>
- <field name="date_end"/>
- <field name="useability"/>
+ <field name="date_start" readonly="1"/>
+ <field name="date_end" readonly="1"/>
+ <field name="useability" string="Availability"/>
</tree>
<form string="Project Resource Allocation">
<field name="resource_id" context="{'project_id':parent.project_id}"/>
- <field name="date_start"/>
- <field name="date_end"/>
- <field name="useability"/>
+ <field name="date_start" readonly="1"/>
+ <field name="date_end" readonly="1"/>
+ <field name="useability" string="Availability"/>
</form>
</field>
<separator string="" colspan="4"/>
@@ -148,15 +148,17 @@
<button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
</group>
</page>
- <page string="Task Detail">
- <field colspan="4" name="task_ids" context="{'default_project_id' :project_id}" nolabel="1">
- <tree editable="bottom" string="Project's Tasks">
+ <page string="Tasks Details">
+ <field colspan="4" name="task_ids" readonly="1" context="{'default_project_id' :project_id}" nolabel="1">
+ <tree string="Project's Tasks">
<field name="sequence"/>
<field name="name"/>
<field name="user_id"/>
<field name="planned_hours" widget="float_time"/>
<field name="project_id" invisible="1"/>
<field name="total_hours" sum='Total Hours'/>
+ <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
+ <field name="state"/>
</tree>
<form string="Project's Tasks">
<notebook colspan="4">
@@ -165,6 +167,7 @@
<field name="name"/>
<field name="project_id"/>
<field name="user_id"/>
+ <field name="sequence"/>
</group>
<group colspan="2" col="2">
<separator string="Dates" colspan="2"/>
@@ -175,7 +178,7 @@
<separator string="Planning" colspan="2"/>
<field name="planned_hours" widget="float_time"/>
<field name="total_hours" widget="float_time"/>
- <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
+ <field name="remaining_hours" widget="float_time"/>
<field name="effective_hours" invisible="1"/>
</group>
<group colspan="6" col="4">