diff options
| author | Sbh (OpenERP) <sbh@tinyerp.com> | 2010-12-23 13:44:58 +0530 |
|---|---|---|
| committer | Sbh (OpenERP) <sbh@tinyerp.com> | 2010-12-23 13:44:58 +0530 |
| commit | 6b8317f70498d0d180879dff8a59ea05f4153ef7 (patch) | |
| tree | bd5823e2e2fceaa0477ffe1019c353f2d07e7de1 /addons/project | |
| parent | d375799f667452f80d39fa404c151634a200199e (diff) | |
| parent | 7c46db34b05dd9ddcefc3fda55e32caf2c504886 (diff) | |
[MERGE] Merge crm and project improvement
bzr revid: sbh@tinyerp.com-20101223081458-kcbi2ul623hxr31y
Diffstat (limited to 'addons/project')
| -rw-r--r-- | addons/project/project_view.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 5fb67b80a50..fafb808ea37 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -235,7 +235,7 @@ </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'])]}"> + <field colspan="4" name="work_ids" nolabel="1" attrs="{'invisible':[('state','in',['draft'])],'readonly':[('state','=','done')]}"> <tree string="Task Work" editable="top"> <field name="name" /> <field name="hours" widget="float_time" sum="Spent Hours"/> @@ -312,8 +312,10 @@ <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="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="total_hours"/> + <field name="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)" |