[MERGE]

bzr revid: hmo@tinyerp.com-20100826093911-vhxhjg1bxo73rysa

1 files changed, 13 insertions, 2 deletions

diff --git a/addons/project/wizard/project_close_task.py b/addons/project/wizard/project_close_task.py
index eb5589f2e3a..58d085774df 100644
--- a/addons/project/wizard/project_close_task.py
+++ b/addons/project/wizard/project_close_task.py
@@ -71,12 +71,23 @@ class project_close_task(osv.osv_memory):
     _defaults = {
        'manager_email': _get_manager_email,
        'partner_email': _get_partner_email,
-       'description': _get_desc,
     }
 
     def close(self, cr, uid, ids, context=None):
+        data = self.read(cr,uid,ids)[0]
+        task_pool = self.pool.get('project.task')
+        user_name = self.pool.get('res.users').browse(cr, uid, uid).name
+        description = _("Closed By ") + user_name + _(" At ") + time.strftime('%Y-%m-%d %H:%M:%S')
+        description += "\n" + "=======================" + "\n"  + data['description']
         if 'task_id' in context:
-            self.pool.get('project.task').write(cr, uid, [context['task_id']], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
+            task = task_pool.browse(cr, uid, context['task_id'])
+            description = task.description + "\n\n" + description
+            task_pool.write(cr, uid, [task.id], {
+                    'description': description,
+                    'state': 'done', 
+                    'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 
+                    'remaining_hours': 0.0
+            })
         return {}
 
     def confirm(self, cr, uid, ids, context=None):