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

[jftempo]

=== modified file 'bin/addons/base/res/res_user.py'
--- bin/addons/base/res/res_user.py	2017-04-18 07:56:21 +0000
+++ bin/addons/base/res/res_user.py	2017-07-04 09:19:39 +0000
@@ -1069,13 +1069,21 @@
                     return
                 audit_rule_ids = user_obj.check_audit(cr, uid, 'write')
                 if users_deleted:
-                    previous_values = [x for x in previous_values if x['id'] in users_deleted]
+                    users_deleted_previous_values = [x for x in previous_values if x['id'] in users_deleted]
                     current_values = dict((x['id'], x) for x in user_obj.read(cr, uid, users_deleted, ['groups_id'], context=context))
-                    audit_obj.audit_log(cr, uid, audit_rule_ids, user_obj, users_deleted, 'write', previous_values, current_values, context=context)
+                    audit_obj.audit_log(cr, uid, audit_rule_ids, user_obj,
+                                        users_deleted, 'write',
+                                        users_deleted_previous_values,
+                                        current_values,
+                                        context=context)
                 if users_added:
-                    previous_values = [x for x in previous_values if x['id'] in users_added]
+                    users_added_previous_values = [x for x in previous_values if x['id'] in users_added]
                     current_values = dict((x['id'], x) for x in user_obj.read(cr, uid, users_added, ['groups_id'], context=context))
-                    audit_obj.audit_log(cr, uid, audit_rule_ids, user_obj, users_added, 'write', previous_values, current_values, context=context)
+                    audit_obj.audit_log(cr, uid, audit_rule_ids, user_obj,
+                                        users_added, 'write',
+                                        users_added_previous_values,
+                                        current_values,
+                                        context=context)
 
     def create(self, cr, uid, vals, context=None):
         '''