diff options
| author | Fabien Pinckaers <fp@openerp.com> | 2012-08-15 20:57:13 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@openerp.com> | 2012-08-15 20:57:13 +0200 |
| commit | d820e866ee2ce0a69a268c0302cbbeb45e5b0f50 (patch) | |
| tree | c3e88ba65e7990d5306c87c49c23431100bb4310 /addons/base_crypt/crypt.py | |
| parent | a4f9b6ca0971aa5aca6fa30342e6acb950f42c3b (diff) | |
| parent | 50275e9ec945ba6865a09e9cd708793018bed0dd (diff) | |
[MERGE] trunk
bzr revid: fp@openerp.com-20120815185713-82zylb0yqqgs008y
Diffstat (limited to 'addons/base_crypt/crypt.py')
| -rw-r--r-- | addons/base_crypt/crypt.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py index f7e200560a3..b27dad22363 100644 --- a/addons/base_crypt/crypt.py +++ b/addons/base_crypt/crypt.py @@ -213,7 +213,7 @@ class users(osv.osv): # Check if the encrypted password matches against the one in the db. cr.execute("""UPDATE res_users - SET date=now() AT TIME ZONE 'UTC' + SET login_date=now() AT TIME ZONE 'UTC' WHERE id=%s AND password=%s AND active RETURNING id""", (int(id), encrypted_pw.encode('utf-8'))) |