pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Forward-port of 7.0 bugfixes up to rev. 9339 (dle@openerp.com-20130801151539-z0bes7ylx5qwa8tw)

Browse Source 
bzr revid: dle@openerp.com-20130801142357-09zojxyhaop9fwna
bzr revid: dle@openerp.com-20130801155334-hq3dzmheppde3xqp
This commit is contained in:
Denis Ledoux
2013-08-01 17:53:34 +02:00
parent 957fa4e2da f551350b80
commit 93ffa6dbcb
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/auth_crypt/auth_crypt.py
+10 -9
View File
@@ -143,7 +143,7 @@ class res_users(osv.osv):
cr.execute('SELECT password, password_crypt FROM res_users WHERE id=%s AND active', (uid,))
if cr.rowcount:
stored_password, stored_password_crypt = cr.fetchone()
if password and not stored_password_crypt:
if stored_password and not stored_password_crypt:
salt = gen_salt()
stored_password_crypt = md5crypt(stored_password, salt)
cr.execute("UPDATE res_users SET password='', password_crypt=%s WHERE id=%s", (stored_password_crypt, uid))
@@ -151,14 +151,15 @@ class res_users(osv.osv):
return super(res_users, self).check_credentials(cr, uid, password)
except openerp.exceptions.AccessDenied:
# check md5crypt
if stored_password_crypt[:len(magic_md5)] == magic_md5:
salt = stored_password_crypt[len(magic_md5):11]
if stored_password_crypt == md5crypt(password, salt):
return
elif stored_password_crypt[:len(magic_md5)] == magic_sha256:
salt = stored_password_crypt[len(magic_md5):11]
if stored_password_crypt == md5crypt(password, salt):
return
if stored_password_crypt:
if stored_password_crypt[:len(magic_md5)] == magic_md5:
salt = stored_password_crypt[len(magic_md5):11]
if stored_password_crypt == md5crypt(password, salt):
return
elif stored_password_crypt[:len(magic_md5)] == magic_sha256:
salt = stored_password_crypt[len(magic_md5):11]
if stored_password_crypt == md5crypt(password, salt):
return
# Reraise password incorrect
raise
addons/stock/wizard/stock_change_product_qty.py
+1 -1
View File
@@ -67,7 +67,7 @@ class stock_change_product_qty(osv.osv_memory):
self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
except (orm.except_orm, ValueError):
location_id = False
res.update({'location_id': location_id and location_id.id or False})
res.update({'location_id': location_id})
return res
def change_product_qty(self, cr, uid, ids, context=None):