diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-10-20 17:57:21 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-10-20 17:57:21 +0200 |
| commit | 5ea0f55d654f4c4c928fa1c4ea3ebcf7d1613812 (patch) | |
| tree | ce5bb069ae0d18c882b9ed707bddf36a987bc913 /addons/mail/models | |
| parent | 635572b49d5b70a32b717cf2d52da49b10aac28e (diff) | |
| parent | bee0c11ef7fdd2f289b1b5d33bf4574e519d8fcf (diff) | |
[MERGE] forward port branch saas-15 up to bee0c11ef7f
Diffstat (limited to 'addons/mail/models')
| -rw-r--r-- | addons/mail/models/res_partner.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/addons/mail/models/res_partner.py b/addons/mail/models/res_partner.py index abebd022fea..b07b7c8b118 100644 --- a/addons/mail/models/res_partner.py +++ b/addons/mail/models/res_partner.py @@ -55,7 +55,6 @@ class Partner(models.Model): website_url = 'http://%s' % user.company_id.website if not user.company_id.website.lower().startswith(('http:', 'https:')) else user.company_id.website else: website_url = False - company_name = user.company_id.name model_name = False if message.model: @@ -75,9 +74,15 @@ class Partner(models.Model): if message.res_id and message.model in self.env: record = self.env[message.model].browse(message.res_id) + company = user.company_id; + if record and hasattr(record, 'company_id'): + company = record.company_id; + company_name = company.name; + return { 'signature': signature, 'website_url': website_url, + 'company': company, 'company_name': company_name, 'model_name': model_name, 'record': record, |