From c94116f41becac94b9bcb6c87a862ff4fbaeb58c Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 6 Sep 2011 09:37:42 +0200 Subject: [IMP] project,crm: spellcheck/cleanup `user_prefence`->`user_preference` bzr revid: odo@openerp.com-20110906073742-lzge2gphka2vmft7 --- addons/project/project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/project.py') diff --git a/addons/project/project.py b/addons/project/project.py index 622b5ffc2c2..96e39f1f1de 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 -- cgit v1.2.3 From 02b83e1040d5001872ffe829e2084a124131a00c Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 8 Sep 2011 00:48:29 +0200 Subject: [IMP] project: finish cleanup/integration of mail.compose.message wizard as task close wizard bzr revid: odo@openerp.com-20110907224829-zd00lqshrfphpi31 --- addons/project/project.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'addons/project/project.py') diff --git a/addons/project/project.py b/addons/project/project.py index 96e39f1f1de..e62570a1a43 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -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 -- cgit v1.2.3