[MERGE] forward port branch 8.0 up to 5ece76b

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)
 

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
 

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