diff options
| author | uco (OpenERP) <uco@tinyerp.com> | 2010-12-06 18:41:02 +0530 |
|---|---|---|
| committer | uco (OpenERP) <uco@tinyerp.com> | 2010-12-06 18:41:02 +0530 |
| commit | b1cf433ecc01a58c8abe27fdf9dbaba2deedf7f5 (patch) | |
| tree | 7d4b2df75b76c3529854cf98c401ad59370ce00a /addons/project/project_view.xml | |
| parent | eb04af83f31615e220a1b5e9639e799eb88242d6 (diff) | |
| parent | 5350ab0c1930e6573ee52bd430bb1d0f5adea2a3 (diff) | |
[MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20101206131102-z2xzz8eshkswo00q
Diffstat (limited to 'addons/project/project_view.xml')
| -rw-r--r-- | addons/project/project_view.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index d90ca07a96c..15c90caa6f4 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -5,7 +5,9 @@ <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10" - groups="group_project_manager,group_project_user"/> + groups="group_project_manager,group_project_user" + web_icon="images/project.png" + web_icon_hover="images/project-hover.png"/> <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/> <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/> @@ -223,20 +225,17 @@ widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" on_change="onchange_planned(planned_hours, effective_hours)"/> - <field name="effective_hours" widget="float_time"/> </group> <group col="3" colspan="2"> <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/> <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/> - - <field name="delay_hours" widget="float_time"/> </group> <field colspan="4" name="description" nolabel="1" attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/> <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['draft','done'])]}"> <tree string="Task Work" editable="top"> <field name="name" /> - <field name="hours" widget="float_time" /> + <field name="hours" widget="float_time" sum="Spent Hours"/> <field name="user_id" /> <field name="date" /> </tree> @@ -310,7 +309,8 @@ <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]" invisible="context.get('user_invisible', False)"/> <field name="user_id" invisible="context.get('user_invisible', False)"/> <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/> - <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)"/> + <field name="effective_hours" widget="float_time" sum="Spent Hours"/> + <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)"/> <field name="date_deadline" invisible="context.get('deadline_visible',True)"/> <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/> <button name="next_type" invisible="context.get('set_visible',False)" |