summaryrefslogtreecommitdiff
path: root/addons/project_long_term/project_long_term_view.xml
diff options
context:
space:
mode:
authoratp (Open ERP) <atp@tinyerp.co.in>2010-12-31 10:32:46 +0530
committeratp (Open ERP) <atp@tinyerp.co.in>2010-12-31 10:32:46 +0530
commit43390f37090168d65221e39f11bed8661e822d87 (patch)
tree5b0a4c170916dc7881d6daac1f83c5bb14d8a878 /addons/project_long_term/project_long_term_view.xml
parent4dff1eb5b60509cddcdc82bb17a4bf0e08627dfe (diff)
parenta329a57bdde3ca4006a1fea853c2cde49b90aa40 (diff)
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
bzr revid: atp@tinyerp.co.in-20101231050246-qvscv0l2eoyvncfx
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
-rw-r--r--addons/project_long_term/project_long_term_view.xml18
1 files changed, 12 insertions, 6 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 6b5c826eae3..e7f63008585 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -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>
@@ -135,7 +135,7 @@
<field name="resource_id" context="{'project_id':parent.project_id}"/>
<field name="date_start"/>
<field name="date_end"/>
- <field name="useability"/>
+ <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">
@@ -219,6 +222,8 @@
<field name="project_id" on_change="onchange_project(project_id)"/>
<field name="responsible_id"/>
<field name="date_start"/>
+ <field name="date_end"/>
+ <field name="duration"/>
<field name="state"/>
</tree>
</field>
@@ -268,6 +273,7 @@
</field>
<field name="responsible_id"/>
<field name="date_start"/>
+ <field name="date_end"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">