diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-08-27 14:53:45 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-08-27 14:53:45 +0200 |
| commit | 1385b60004dde5e2b1738161280d979f60cc0418 (patch) | |
| tree | 9c1be5a673658f6bc4c8a6b2de5361055addc1d5 | |
| parent | 61ad8a9ea70671bf5059c65aa3aae10b8ae1ce71 (diff) | |
| parent | ea821b991ae6ada5545014440d823bbfea5828b9 (diff) | |
[MERGE] forward port branch saas-15 up to ea821b991ae
| -rw-r--r-- | addons/account/models/account.py | 2 | ||||
| -rw-r--r-- | odoo/tools/mail.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/account/models/account.py b/addons/account/models/account.py index ed9bbd9d6f3..0243aa879af 100644 --- a/addons/account/models/account.py +++ b/addons/account/models/account.py @@ -690,7 +690,7 @@ class AccountJournal(models.Model): @api.depends('company_id') def _belong_to_company(self): for journal in self: - journal.belong_to_company = (journal.company_id.id == self.env.user.company_id.id) + journal.belongs_to_company = (journal.company_id.id == self.env.user.company_id.id) @api.multi def _search_company_journals(self, operator, value): diff --git a/odoo/tools/mail.py b/odoo/tools/mail.py index 098a2447d16..ad0f02f1ec1 100644 --- a/odoo/tools/mail.py +++ b/odoo/tools/mail.py @@ -34,7 +34,7 @@ safe_attrs = clean.defs.safe_attrs | frozenset( ['style', 'data-o-mail-quote', # quote detection 'data-oe-model', 'data-oe-id', 'data-oe-field', 'data-oe-type', 'data-oe-expression', 'data-oe-translation-id', 'data-oe-nodeid', - 'data-publish', 'data-id', 'data-res_id', 'data-member_id', 'data-view-id' + 'data-publish', 'data-id', 'data-res_id', 'data-interval', 'data-member_id', 'data-scroll-background-ratio', 'data-view-id', ]) |