From 8cfb4858918f0aedc6951944c28cdfdb08f3369c Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Tue, 6 Mar 2018 13:45:23 +0100 Subject: [PATCH 1/4] [FIX] im_livechat: empty regex If `regex_url` is not set, `re.search` crashes. opw-1805669 --- addons/im_livechat/models/im_livechat_channel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/im_livechat/models/im_livechat_channel.py b/addons/im_livechat/models/im_livechat_channel.py index 91e49b9babb..8b21e60d171 100644 --- a/addons/im_livechat/models/im_livechat_channel.py +++ b/addons/im_livechat/models/im_livechat_channel.py @@ -239,7 +239,7 @@ class ImLivechatChannelRule(models.Model): """ def _match(rules): for rule in rules: - if re.search(rule.regex_url, url): + if re.search(rule.regex_url or '', url): return rule return False # first, search the country specific rules (the first match is returned) From 9cf9938f045d20628fbffc27cd159bdf4a8d256e Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Wed, 7 Mar 2018 10:32:52 +0100 Subject: [PATCH 2/4] [CLA][FIX] fix encoding of a CLA that was in ISO8859-1 In a near future (I hope), runbot will reject CLA that are not UTF-8 encoded. --- doc/cla/individual/lbelorgey.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/cla/individual/lbelorgey.md b/doc/cla/individual/lbelorgey.md index 6cdacb5cdf1..c8db490ec4d 100644 --- a/doc/cla/individual/lbelorgey.md +++ b/doc/cla/individual/lbelorgey.md @@ -8,4 +8,4 @@ declaration. Signed, -Laurent Bélorgey lb@lalieutenante.com https://github.com/lbelorgey \ No newline at end of file +Laurent BĂ©lorgey lb@lalieutenante.com https://github.com/lbelorgey \ No newline at end of file From 1cc21d7eb658a96fdaaf0d55a0b445c1aaacaf64 Mon Sep 17 00:00:00 2001 From: "Stefan Rijnhart (Opener)" Date: Wed, 7 Mar 2018 11:29:04 +0100 Subject: [PATCH 3/4] [FIX] account: use correct model in report definition `account.report.journal` and `account.report_partnerledger` aren't valid models --- addons/account/views/account_report.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/views/account_report.xml b/addons/account/views/account_report.xml index 605c6f7c64b..b7eb3603fa4 100644 --- a/addons/account/views/account_report.xml +++ b/addons/account/views/account_report.xml @@ -71,7 +71,7 @@ Date: Wed, 7 Mar 2018 11:44:36 +0100 Subject: [PATCH 4/4] [FIX] base: whoopsie Autovacuum wouldn't be executed at all!! `cr` is not defined. Fixes commit 8b119e2 --- odoo/addons/base/ir/ir_autovacuum.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odoo/addons/base/ir/ir_autovacuum.py b/odoo/addons/base/ir/ir_autovacuum.py index 1bbbd4ee096..a85f82af6a9 100644 --- a/odoo/addons/base/ir/ir_autovacuum.py +++ b/odoo/addons/base/ir/ir_autovacuum.py @@ -18,7 +18,7 @@ class AutoVacuum(models.AbstractModel): model = self.env[mname] if model.is_transient(): try: - with cr.savepoint(): + with self._cr.savepoint(): model._transient_vacuum(force=True) except Exception as e: _logger.warning("Failed to clean transient model %s\n%s", model, str(e))