summaryrefslogtreecommitdiff
path: root/addons/auth_signup/res_users.py
diff options
context:
space:
mode:
authorMartin Trigaux <mat@odoo.com>2015-12-01 08:41:52 +0100
committerMartin Trigaux <mat@odoo.com>2015-12-01 08:41:52 +0100
commita9ec2894ded44e405a9adfe8a8c021a7dcc27c20 (patch)
tree56f82900a68aa55a84c8f4819082272498910f1a /addons/auth_signup/res_users.py
parent0ee11f23f15ab11851baf3ca00d9c3a5947fe294 (diff)
parent19fe77b7d71aed1b25bc3f15538eea0a5510020b (diff)
[MERGE] forward port of branch saas-6 up to 19fe77b
Diffstat (limited to 'addons/auth_signup/res_users.py')
-rw-r--r--addons/auth_signup/res_users.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 4b99259a8a9..92ebcb093b0 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -265,8 +265,7 @@ class res_users(osv.Model):
res_partner.signup_prepare(cr, uid, partner_ids, signup_type="reset", expiration=expiration, context=context)
- if not context:
- context = {}
+ context = dict(context or {})
# send email to users with their signup url
template = False
@@ -283,6 +282,7 @@ class res_users(osv.Model):
for user in self.browse(cr, uid, ids, context):
if not user.email:
raise UserError(_("Cannot send email: user %s has no email address.") % user.name)
+ context['lang'] = user.lang
self.pool.get('mail.template').send_mail(cr, uid, template.id, user.id, force_send=True, raise_exception=True, context=context)
def create(self, cr, uid, values, context=None):