From 3cedece2500bd4e8e1adba6de49a1aae7a86ed98 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Mon, 16 Mar 2009 17:28:26 +0100
Subject: [PATCH] [IMP]	* improved view of one2many of delegated tasks [FIX]
 * don't put twice 'CHECK' if the task is delegated 2 times

bzr revid: qdp@tinyerp.com-20090316162826-5q14p9nxpn1numuo
---
 addons/project/project_view.xml        | 7 ++++---
 addons/project/wizard/task_delegate.py | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6244c2ceca4..61dbe6d9f4d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -310,10 +310,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"/>
diff --git a/addons/project/wizard/task_delegate.py b/addons/project/wizard/task_delegate.py
index 3eb2a5814b4..d2919dcb54e 100644
--- a/addons/project/wizard/task_delegate.py
+++ b/addons/project/wizard/task_delegate.py
@@ -80,13 +80,13 @@ class wizard_delegate(wizard.interface):
         if task.name.startswith(_('CHECK: ')):
             newname = task.name.strip(_('CHECK: '))
         else:
-            newname = task.name
+            newname = task.name or ''
         return {
             'name': newname,
             'user_id': False,
             'planned_hours': task.remaining_hours,
             'planned_hours_me': 1.0,
-            'prefix': _('CHECK: ')+ (task.name or ''),
+            'prefix': _('CHECK: ')+ newname,
             'include_info': 1,
             'state': 'pending'
         }