[MERGE] forward port branch saas-6 up to 75e7f0d

addons/auth_signup/controllers/main.py

@@ -66,8 +66,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)
 

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