[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:
Denis Ledoux 2014-03-21 15:07:51 +01:00
commit 9fa1b047ba
1 changed files with 3 additions and 1 deletions

View File

@ -135,7 +135,7 @@ Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'we
if not partner.email:
skipped+= 1
continue
user = user_ref.search(cr, uid, [('login', "=", partner.email)])
user = user_ref.search(cr, uid, [('partner_id', "=", partner.id)])
if user:
if user[0] not in new_user:
new_user.append(user[0])
@ -176,6 +176,8 @@ Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'we
if ans:
res_data = {'name': partner.name or _('Unknown'),
'login': partner.email,
'email': partner.email,
'partner_id': partner.id,
'password': passwd,
'address_id': partner.id,
'groups_id': [[6, 0, [group_id]]],