Unifield Server

Merge lp:~fabien-morin/unifield-server/fm-us-2040 into lp:unifield-server

  1. fm-us-2040
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4104
Proposed branch: lp:~fabien-morin/unifield-server/fm-us-2040
Merge into: lp:unifield-server
Diff against target: 12 lines (+1/-1)
1 file modified
bin/addons/msf_profile/msf_profile.py (+1/-1)
To merge this branch: bzr merge lp:~fabien-morin/unifield-server/fm-us-2040
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+312144@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/msf_profile/msf_profile.py'
2--- bin/addons/msf_profile/msf_profile.py 2016-11-25 16:50:37 +0000
3+++ bin/addons/msf_profile/msf_profile.py 2016-11-30 11:02:30 +0000
4@@ -98,7 +98,7 @@
5 """
6 from passlib.hash import bcrypt
7 users_obj = self.pool.get('res.users')
8- user_ids = users_obj.search(cr, uid, [])
9+ user_ids = users_obj.search(cr, uid, [('active', 'in', ('t', 'f'))])
10 for user in users_obj.read(cr, uid, user_ids, ['password']):
11 original_password = tools.ustr(user['password'])
12 # check the password is not already encrypted

Subscribers

People subscribed via source and target branches