diff options
| author | Sbh (OpenERP) <sbh@tinyerp.com> | 2011-01-06 17:17:05 +0530 |
|---|---|---|
| committer | Sbh (OpenERP) <sbh@tinyerp.com> | 2011-01-06 17:17:05 +0530 |
| commit | dec836ec284ea874822e29b183d62502266c3c56 (patch) | |
| tree | c09567d903a1ec5bce7adce07043c0281ef60fcb /addons/project_long_term/project_long_term_view.xml | |
| parent | 61b21841b1751b63336cb8dcacab57c76ff6b0a1 (diff) | |
| parent | c738ec75ca0048c13b7854a0665ae87f048e3acf (diff) | |
[MERGE] Merge with team1 branch
bzr revid: sbh@tinyerp.com-20110106114705-9jbx7e33a2sl101c
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 37 |
1 files changed, 23 insertions, 14 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..ff4cfd8575b 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,19 @@ <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="date_start"/> + <field name="date_end" /> <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,17 +169,19 @@ <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"/> <field name="date_start"/> + <field name="date_end" /> <field name="date_deadline"/> </group> <group colspan="2" col="2"> <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"> @@ -187,14 +193,14 @@ </field> <button name="%(action_project_schedule_tasks)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/> </page> - <page string="Other Info"> + <page string="Schedule and Display info"> <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="Scheduling" colspan="2"/> + <separator string="Displaying settings" colspan="2"/> <field name="sequence"/> </group> <separator colspan="4" string="Previous Phases"/> @@ -219,6 +225,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 +276,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"> |