[MERGE] forward port branch 10.0 up to 69c7d696d8

addons/account/views/account_report.xml

@@ -95,7 +95,7 @@
 
         <report 
             id="action_report_journal"
-            model="account.report.journal"
+            model="report.account.report_journal"
             string="Sale/Purchase Journal"
             report_type="qweb-pdf"
             name="account.report_journal"
@@ -104,7 +104,7 @@
 
         <report 
             id="action_report_partnerledger"
-            model="account.report_partnerledger"
+            model="report.account.report_partnerledger"
             string="Partner Ledger"
             report_type="qweb-pdf"
             name="account.report_partnerledger"

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)

doc/cla/individual/lbelorgey.md

@@ -8,4 +8,4 @@ declaration.
 
 Signed,
 
-Laurent Bélorgey lb@lalieutenante.com https://github.com/lbelorgey
+Laurent Bélorgey lb@lalieutenante.com https://github.com/lbelorgey

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))