diff options
| author | husen daudi <hda@hda> | 2009-04-13 18:13:13 +0530 |
|---|---|---|
| committer | husen daudi <hda@hda> | 2009-04-13 18:13:13 +0530 |
| commit | ea2efc15067b3b5f6448a5bce7baae8880c7bfbb (patch) | |
| tree | 921b362d733c0e601792aa59955a81cd70722f3a /addons/project/project_view.xml | |
| parent | 7767525f1edc8c5e7dd32678ffce9ed2d19310a7 (diff) | |
| parent | 4b180641bdc3356ec778a98bc10d936042a8fc12 (diff) | |
Ported all bugs from trunk to stable
bzr revid: hda@hda-20090413124313-x9gdobzpxf1lkfxl
Diffstat (limited to 'addons/project/project_view.xml')
| -rw-r--r-- | addons/project/project_view.xml | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 0c032a62aea..1e10a534ece 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -311,10 +311,11 @@ <tree string="Delegated tasks"> <field name="name"/> <field name="user_id"/> - <field name="date_deadline"/> - <field name="planned_hours" widget="float_time"/> - <field name="effective_hours" widget="float_time"/> <field name="state"/> + <field name="effective_hours" widget="float_time"/> + <field name="progress" widget="progressbar"/> + <field name="remaining_hours" widget="float_time"/> + <field name="date_deadline"/> </tree> </field> <field colspan="4" name="parent_id"/> @@ -359,6 +360,28 @@ </field> </record> + <record id="my_pending_task" model="ir.ui.view"> + <field name="name">my.pending.task.tree</field> + <field name="model">project.task</field> + <field name="type">tree</field> + <field eval="2" name="priority"/> + <field name="arch" type="xml"> + <tree colors="grey:state in ('cancel','done');blue:remaining_hours<0;red:bool(date_deadline) & (date_deadline<current_date) & (state in ('draft','open'))" string="Tasks"> + <field name="sequence"/> + <field name="name"/> + <field name="project_id"/> + <field name="delegated_user_id"/> + <field name="date_deadline"/> + <field name="planned_hours" sum="Planned" widget="float_time"/> + <field name="delay_hours" sum="Delay" widget="float_time"/> + <field name="progress" widget="progressbar"/> + <field name="priority"/> + <field name="state"/> + <field name="remaining_hours" invisible="1"/> + </tree> + </field> + </record> + <record id="view_task_calendar" model="ir.ui.view"> <field name="name">project.task.calendar</field> <field name="model">project.task</field> @@ -423,6 +446,7 @@ <field name="view_type">form</field> <field name="view_mode">tree,form,calendar,graph</field> <field name="domain">[('user_id', '=', uid),('state','=','pending')]</field> + <field name="view_id" ref="my_pending_task"/> </record> <menuitem action="action_view_task5_pending" id="menu_tasks_yours_pending" parent="menu_action_view_task4"/> |