[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9158 revid:dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140321140751-cf85vp7m2p7pa4uf
This commit is contained in:
commit
9fa1b047ba
|
@ -135,7 +135,7 @@ Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'we
|
||||||
if not partner.email:
|
if not partner.email:
|
||||||
skipped+= 1
|
skipped+= 1
|
||||||
continue
|
continue
|
||||||
user = user_ref.search(cr, uid, [('login', "=", partner.email)])
|
user = user_ref.search(cr, uid, [('partner_id', "=", partner.id)])
|
||||||
if user:
|
if user:
|
||||||
if user[0] not in new_user:
|
if user[0] not in new_user:
|
||||||
new_user.append(user[0])
|
new_user.append(user[0])
|
||||||
|
@ -176,6 +176,8 @@ Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'we
|
||||||
if ans:
|
if ans:
|
||||||
res_data = {'name': partner.name or _('Unknown'),
|
res_data = {'name': partner.name or _('Unknown'),
|
||||||
'login': partner.email,
|
'login': partner.email,
|
||||||
|
'email': partner.email,
|
||||||
|
'partner_id': partner.id,
|
||||||
'password': passwd,
|
'password': passwd,
|
||||||
'address_id': partner.id,
|
'address_id': partner.id,
|
||||||
'groups_id': [[6, 0, [group_id]]],
|
'groups_id': [[6, 0, [group_id]]],
|
||||||
|
|
Loading…
Reference in New Issue