[MERGE] merged with main addons

bzr revid: bde@tinyerp.com-20110915113201-fgbs2d2qr45ljmsg

1 files changed, 4 insertions, 3 deletions

diff --git a/addons/project/project.py b/addons/project/project.py
index 622b5ffc2c2..e62570a1a43 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -55,7 +55,7 @@ class project(osv.osv):
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         if user == 1:
             return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order, context=context, count=count)
-        if context and context.has_key('user_prefence') and context['user_prefence']:
+        if context and context.get('user_preference'):
                 cr.execute("""SELECT project.id FROM project_project project
                            LEFT JOIN account_analytic_account account ON account.id = project.analytic_account_id
                            LEFT JOIN project_user_rel rel ON rel.project_id = project.analytic_account_id
@@ -590,11 +590,12 @@ class task(osv.osv):
                 'name': _('Send Email after close task'),
                 'view_type': 'form',
                 'view_mode': 'form',
-                'res_model': 'project.task.close',
+                'res_model': 'mail.compose.message',
                 'type': 'ir.actions.act_window',
                 'target': 'new',
                 'nodestroy': True,
-                'context': {'active_id': task.id}
+                'context': {'active_id': task.id,
+                            'active_model': 'project.task'}
            }
         return res