From 8443a74cd6e4c8aae67668da5ee52c6f9c1661bc Mon Sep 17 00:00:00 2001 From: mreficent Date: Wed, 21 Aug 2019 21:35:57 +0000 Subject: [PATCH 1/2] [FIX] account: computes correctly belongs_to_company Typo of https://github.com/odoo/odoo/commit/b154e219f68cc378ba8cc9dedf1d48819cd8e87a closes odoo/odoo#35937 Signed-off-by: Martin Trigaux (mat) --- addons/account/models/account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/models/account.py b/addons/account/models/account.py index f8f1303277c..1e739007490 100644 --- a/addons/account/models/account.py +++ b/addons/account/models/account.py @@ -534,7 +534,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): From da474d0e872c9938b061e133011bd36b416eafc7 Mon Sep 17 00:00:00 2001 From: Nicolas Lempereur Date: Thu, 22 Aug 2019 10:19:05 +0000 Subject: [PATCH 2/2] [FIX] web_editor: parallax effect in sanitized field A sanitize fields by default remove all attributes outside of a whitelist (if sanitize_attributes on field is not set to false). This prevent to use parallax widget in Html sanitized field since attribute "data-scroll-background-ratio" define parallax effect speed but was not in whitelist. note: also keep data-interval for gallery widget opw-2053983 closes #35961 Signed-off-by: Nicolas Lempereur (nle) --- odoo/tools/mail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odoo/tools/mail.py b/odoo/tools/mail.py index 65ba6b32be1..74ad5154224 100644 --- a/odoo/tools/mail.py +++ b/odoo/tools/mail.py @@ -33,7 +33,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', ])