diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-12-09 15:04:42 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-12-09 15:04:42 +0100 |
| commit | 75e7f0da10d1b74af09b1afdf74b19ef7a504f58 (patch) | |
| tree | 613a6b948501d38fa54b341697ee854fa4e303fd | |
| parent | da5d6289114c0cf687681bde8debed6676698abf (diff) | |
| parent | 5ece76b71754b5d048ab9a2f99fd905fcefeac6b (diff) | |
[MERGE] forward port branch 8.0 up to 5ece76b
| -rw-r--r-- | addons/auth_signup/controllers/main.py | 3 | ||||
| -rw-r--r-- | addons/project/project.py | 2 | ||||
| -rw-r--r-- | doc/cla/individual/Sergio2409.md | 11 |
3 files changed, 13 insertions, 3 deletions
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py index 9a24aa3a39b..48d533b8cf6 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) diff --git a/addons/project/project.py b/addons/project/project.py index e6b169541f5..182886c9358 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -1029,7 +1029,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 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 |