diff options
| author | Olivier Dony <odo@openerp.com> | 2015-07-29 14:01:08 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2015-07-29 14:01:17 +0200 |
| commit | bb2c051d25063b39d21dcfe789721b790f16e1df (patch) | |
| tree | ceecbd445e98b367f55cce39348b5fd0ba0034bf /addons/auth_crypt | |
| parent | ecfaf213c470925caffb94ca3a0263595c79e87d (diff) | |
| parent | cc5860fbcf86568f2ca7404cf8c47e41357c0f3d (diff) | |
[MERGE] Forward-port of latest bugfixes from saas-3 up to cc5860fbcf86568f2ca7404cf8c47e41357c0f3d
Diffstat (limited to 'addons/auth_crypt')
| -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 eb57c8aa063..30c953e5780 100644 --- a/addons/auth_crypt/auth_crypt.py +++ b/addons/auth_crypt/auth_crypt.py @@ -5,7 +5,8 @@ from passlib.context import CryptContext import openerp from openerp.osv import fields, osv -openerp.addons.base.res.res_users.USER_PRIVATE_FIELDS.append('password_crypt') +from openerp.addons.base.res import res_users +res_users.USER_PRIVATE_FIELDS.append('password_crypt') _logger = logging.getLogger(__name__) |