From 85dc060a066163217be25895b090bf5a75ea61e2 Mon Sep 17 00:00:00 2001 From: sergiov Date: Tue, 25 Oct 2016 11:21:39 -0400 Subject: [PATCH 1/3] [CLA] signature for Sergio2409 cf #13960 --- doc/cla/individual/Sergio2409.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/cla/individual/Sergio2409.md diff --git a/doc/cla/individual/Sergio2409.md b/doc/cla/individual/Sergio2409.md new file mode 100644 index 00000000000..dd118d31abf --- /dev/null +++ b/doc/cla/individual/Sergio2409.md @@ -0,0 +1,11 @@ +Cuba, 2016-10-24 + +I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Sergio Valdés sergiov@merchise.org https://github.com/Sergio2409 From 4792a669d3fb167800d5cdb3d2c03d2056b952f0 Mon Sep 17 00:00:00 2001 From: sergiov Date: Mon, 24 Oct 2016 16:34:06 -0400 Subject: [PATCH 2/3] [FIX] auth_signup: display full error message When the user name entered hasn't an email specified the error message wasn't displayed in the reset view. The error message was in e.name, not e.message --- addons/auth_signup/controllers/main.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py index 7678db52198..e7656a6f50a 100644 --- a/addons/auth_signup/controllers/main.py +++ b/addons/auth_signup/controllers/main.py @@ -84,8 +84,7 @@ class AuthSignupHome(openerp.addons.web.controllers.main.Home): qcontext['error'] = _("Could not reset your password") _logger.exception('error when resetting password') except Exception, e: - qcontext['error'] = _(e.message) - + qcontext['error'] = e.message or e.name return request.render('auth_signup.reset_password', qcontext) From 5ece76b71754b5d048ab9a2f99fd905fcefeac6b Mon Sep 17 00:00:00 2001 From: Cristian Moncho Date: Thu, 11 Aug 2016 10:18:04 +0200 Subject: [PATCH 3/3] [FIX] project: remove redundant context declaration Declaring the keyword argument `context` in an API v7 `orm.browse_record` can lead to mixed API v7/v8 inheritance bugs (`context` will be treated as a function parameter instead of being injected in `self.env.context`). As the context is already propagated in line 953, we can safely remove it from line 971. Closes #13115 --- addons/project/project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/project.py b/addons/project/project.py index 49fc172df55..82b7c01d3bc 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -968,7 +968,7 @@ class task(osv.osv): 'remaining_hours': delegate_data['planned_hours_me'], 'planned_hours': delegate_data['planned_hours_me'] + (task.effective_hours or 0.0), 'name': newname, - }, context=context) + }) delegated_tasks[task.id] = delegated_task_id return delegated_tasks