[MERGE] trunk
bzr revid: al@openerp.com-20120815224827-b3sl1q6rso62f69d
This commit is contained in:
commit
21cfdfb988
|
@ -119,7 +119,8 @@ class res_users(osv.Model):
|
||||||
company_name = user.company_id.name if user.company_id else _('the company')
|
company_name = user.company_id.name if user.company_id else _('the company')
|
||||||
subject = '''%s has joined %s.''' % (user.name, company_name)
|
subject = '''%s has joined %s.''' % (user.name, company_name)
|
||||||
body = '''Welcome to OpenERP !'''
|
body = '''Welcome to OpenERP !'''
|
||||||
return self.pool.get('res.partner').message_append_note(cr, user.id, [user.partner_id.id],
|
# TODO change 1 into user.id but catch errors
|
||||||
|
return self.pool.get('res.partner').message_append_note(cr, 1, [user.partner_id.id],
|
||||||
subject=subject, body=body, type='comment', content_subtype='html', context=context)
|
subject=subject, body=body, type='comment', content_subtype='html', context=context)
|
||||||
|
|
||||||
def write(self, cr, uid, ids, vals, context=None):
|
def write(self, cr, uid, ids, vals, context=None):
|
||||||
|
|
Loading…
Reference in New Issue