diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-04-10 18:24:46 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-04-10 18:24:46 +0200 |
| commit | d3e7a8ef5e825ff7b4c0f936345bb01961bd93d5 (patch) | |
| tree | 7981890a0e66778f8d5375c9abb754e5c64eda16 /addons/auth_crypt/auth_crypt.py | |
| parent | 59d82e6fe7ef9267c6380c271e51e6f5bc8aa383 (diff) | |
| parent | 856bc6f2b147970245f96e26d882f114c32e035c (diff) | |
[MERGE] forward port of branch 7.0 up to 856bc6f
Diffstat (limited to 'addons/auth_crypt/auth_crypt.py')
| -rw-r--r-- | addons/auth_crypt/auth_crypt.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/auth_crypt/auth_crypt.py b/addons/auth_crypt/auth_crypt.py index c5bd5799017..a7e3a826223 100644 --- a/addons/auth_crypt/auth_crypt.py +++ b/addons/auth_crypt/auth_crypt.py @@ -22,6 +22,8 @@ _logger = logging.getLogger(__name__) magic_md5 = '$1$' magic_sha256 = '$5$' +openerp.addons.base.res.res_users.USER_PRIVATE_FIELDS.append('password_crypt') + def gen_salt(length=8, symbols=None): if symbols is None: symbols = ascii_letters + digits @@ -173,5 +175,4 @@ class res_users(osv.osv): # Reraise password incorrect raise - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |