From 9793aade9155da6a5fb49d1577fb98def62604b4 Mon Sep 17 00:00:00 2001
From: Holoborodko Bohdan <holoborodko.bohdan@gmail.com>
Date: Tue, 15 Sep 2026 11:31:02 +0000
Subject: [PATCH 1/8] [FIX] queue_job: validate JobSerialized base_type again

Odoo 19 renamed Field._setup_attrs to _setup_attrs__, so the override
was no longer called and an unsupported base_type was silently accepted.
---
 queue_job/fields.py                | 4 ++--
 queue_job/tests/test_json_field.py | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/queue_job/fields.py b/queue_job/fields.py
index d9f371605f..bb5b6597ae 100644
--- a/queue_job/fields.py
+++ b/queue_job/fields.py
@@ -42,8 +42,8 @@ class JobSerialized(fields.Json):
     def __init__(self, string=SENTINEL, base_type=SENTINEL, **kwargs):
         super().__init__(string=string, _base_type=base_type, **kwargs)
 
-    def _setup_attrs(self, model, name):  # pylint: disable=missing-return
-        super()._setup_attrs(model, name)
+    def _setup_attrs__(self, model, name):  # pylint: disable=missing-return
+        super()._setup_attrs__(model, name)
         if self._base_type not in self._default_json_mapping:
             msg = f"{self._base_type} is not a supported base type"
             raise ValueError(msg)
diff --git a/queue_job/tests/test_json_field.py b/queue_job/tests/test_json_field.py
index 23974e23c9..2f7c886f14 100644
--- a/queue_job/tests/test_json_field.py
+++ b/queue_job/tests/test_json_field.py
@@ -11,7 +11,7 @@
 
 # pylint: disable=odoo-addons-relative-import
 # we are testing, we want to test as we were an external consumer of the API
-from odoo.addons.queue_job.fields import JobDecoder, JobEncoder
+from odoo.addons.queue_job.fields import JobDecoder, JobEncoder, JobSerialized
 
 
 class TestJson(common.TransactionCase):
@@ -195,3 +195,9 @@ def test_decoder_etree(self):
         value = json.loads(value_json, cls=JobDecoder, env=self.env)
         value[2] = etree.tostring(value[2])
         self.assertEqual(value, expected)
+
+    def test_job_serialized_base_type_is_validated(self):
+        model_class = type(self.env["queue.job"])
+        JobSerialized(base_type=dict)._setup_attrs__(model_class, "supported")
+        with self.assertRaisesRegex(ValueError, "is not a supported base type"):
+            JobSerialized(base_type=int)._setup_attrs__(model_class, "unsupported")

From 3d75b4c379fb83682b925f5595ce938d639e4243 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 5 Oct 2026 17:41:13 +0000
Subject: [PATCH 2/8] [BOT] post-merge updates

---
 queue_job/README.rst                    | 2 +-
 queue_job/__manifest__.py               | 2 +-
 queue_job/static/description/index.html | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/queue_job/README.rst b/queue_job/README.rst
index f9a974d192..890d52f762 100644
--- a/queue_job/README.rst
+++ b/queue_job/README.rst
@@ -11,7 +11,7 @@ Job Queue
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:aee74431fafa74d2abc078c3686e4d9c6390bacc001cac7c4afa01b9db77ca06
+   !! source digest: sha256:f8cd4a2bc31b48b3081573ba07c2396b47bb99f749d5125d10fcde512a987212
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png
diff --git a/queue_job/__manifest__.py b/queue_job/__manifest__.py
index 03ea411f2c..3d82bb086d 100644
--- a/queue_job/__manifest__.py
+++ b/queue_job/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     "name": "Job Queue",
-    "version": "19.0.2.1.3",
+    "version": "19.0.2.1.4",
     "author": "Camptocamp,ACSONE SA/NV,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/queue",
     "license": "LGPL-3",
diff --git a/queue_job/static/description/index.html b/queue_job/static/description/index.html
index 58b23819d8..ccf5d86df4 100644
--- a/queue_job/static/description/index.html
+++ b/queue_job/static/description/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>README.rst</title>
+<title>Job Queue</title>
 <style type="text/css">
 
 /*
@@ -372,7 +372,7 @@ <h1>Job Queue</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:aee74431fafa74d2abc078c3686e4d9c6390bacc001cac7c4afa01b9db77ca06
+!! source digest: sha256:f8cd4a2bc31b48b3081573ba07c2396b47bb99f749d5125d10fcde512a987212
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Mature" src="https://img.shields.io/badge/maturity-Mature-brightgreen.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/license-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/queue/tree/19.0/queue_job"><img alt="OCA/queue" src="https://img.shields.io/badge/github-OCA%2Fqueue-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/queue-19-0/queue-19-0-queue_job"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/queue&amp;target_branch=19.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This addon adds an integrated Job Queue to Odoo.</p>

From 2f31b1344cbf6bbe5a4c2fce97a05f87501c2c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Todorovich?= <ivan.todorovich@gmail.com>
Date: Tue, 29 Sep 2026 14:23:11 -0300
Subject: [PATCH 3/8] [FIX] queue_job: deadlock when the on fail hook writes
 the job's records

The failure is handled from a temporary cursor while the failed job's
transaction still holds its locks: an on fail hook writing on the same
records waited forever. Perform the job in a savepoint so that its
locks are released when it fails.
---
 queue_job/controllers/main.py              | 12 ++++--
 queue_job/tests/test_run_rob_controller.py | 47 ++++++++++++++++++++++
 2 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/queue_job/controllers/main.py b/queue_job/controllers/main.py
index 92ff000dc8..706c02be79 100644
--- a/queue_job/controllers/main.py
+++ b/queue_job/controllers/main.py
@@ -98,10 +98,14 @@ def _try_perform_job(cls, env, job):
         # TODO refactor, the relation between env and job.env is not clear
         assert env.cr is job.env.cr
         with _prevent_commit(env.cr):
-            job.perform()
-            # Triggers any stored computed fields before calling 'set_done'
-            # so that will be part of the 'exec_time'
-            env.flush_all()
+            # On failure, rolling back the savepoint releases the row locks
+            # the job took on the records it updated: the failure is handled
+            # from another cursor, which may write on the same records (e.g.
+            # the on fail hook).
+            # On success, leaving the savepoint flushes, before 'set_done', so
+            # that the stored computed fields are part of the 'exec_time'.
+            with env.cr.savepoint():
+                job.perform()
             job.set_done()
             job.store()
             env.flush_all()
diff --git a/queue_job/tests/test_run_rob_controller.py b/queue_job/tests/test_run_rob_controller.py
index eb1b5cace5..4090c811ea 100644
--- a/queue_job/tests/test_run_rob_controller.py
+++ b/queue_job/tests/test_run_rob_controller.py
@@ -1,4 +1,5 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from contextlib import closing
 from unittest.mock import patch
 
 from odoo.tests.common import TransactionCase
@@ -50,6 +51,52 @@ def test_runjob_on_fail(self):
             self.assertEqual(job.state, "failed")
             self.assertEqual(mocked_hook.call_count, 1)
 
+    @mute_logger("odoo.addons.queue_job.controllers.main")
+    def test_runjob_on_fail_no_deadlock(self):
+        """The on fail hook can write on the records the failed job wrote.
+
+        The hook runs on another cursor, while the failed job's transaction
+        is still open. Without rolling back the job's changes first, the hook
+        waits for the job's lock, which is only released after the hook.
+        """
+        function = self.env.ref("queue_job.job_function_queue_job__test_job")
+        function.on_fail_method = "_test_on_fail"
+        # Use a committed record, so that the other cursor can see it
+        partner = self.env.ref("base.partner_admin")
+        job = self.env["queue.job"].with_delay()._test_job()
+
+        # The job writes on the partner (locking it), then fails
+        def failing_job():
+            partner.name = "Written by job"
+            partner.flush_recordset()
+            raise JobError("Job failed")
+
+        # The hook writes on the same partner from another cursor. Its changes
+        # are rolled back on close, and the lock timeout avoids waiting forever.
+        def on_fail(**kwargs):
+            with closing(self.registry.cursor()) as other_cr:
+                other_cr.execute("SET LOCAL lock_timeout = '2s'")
+                other_cr.execute(
+                    "UPDATE res_partner SET name = 'Written by hook' WHERE id = %s",
+                    [partner.id],
+                )
+
+        with (
+            self.assertRaises(JobError),
+            patch(
+                "odoo.addons.queue_job.models.queue_job.QueueJob._test_job",
+                side_effect=failing_job,
+            ),
+            patch(
+                "odoo.addons.queue_job.models.queue_job.QueueJob._test_on_fail",
+                side_effect=on_fail,
+            ) as mocked_hook,
+            patch("odoo.addons.queue_job.job.Job.in_temporary_env") as mocked_temp_env,
+        ):
+            mocked_temp_env.return_value.__enter__.return_value = self.env
+            RunJobController._runjob(self.env, job)
+        self.assertEqual(mocked_hook.call_count, 1)
+
     def test_runjob_on_fail_not_configured(self):
         job = self.env["queue.job"].with_delay()._test_job(failure_rate=1)
         with (

From 9d6e1e0a0d71f743e2e15dd68a5aef14b56ff994 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 5 Oct 2026 18:07:37 +0000
Subject: [PATCH 4/8] [BOT] post-merge updates

---
 queue_job/README.rst                    | 2 +-
 queue_job/__manifest__.py               | 2 +-
 queue_job/static/description/index.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/queue_job/README.rst b/queue_job/README.rst
index 890d52f762..d3b06da8ee 100644
--- a/queue_job/README.rst
+++ b/queue_job/README.rst
@@ -11,7 +11,7 @@ Job Queue
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:f8cd4a2bc31b48b3081573ba07c2396b47bb99f749d5125d10fcde512a987212
+   !! source digest: sha256:e4d96f7742767c109795b5d35b5d39c393f95b249e97310c02a4a4c4da27487f
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png
diff --git a/queue_job/__manifest__.py b/queue_job/__manifest__.py
index 3d82bb086d..2968232881 100644
--- a/queue_job/__manifest__.py
+++ b/queue_job/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     "name": "Job Queue",
-    "version": "19.0.2.1.4",
+    "version": "19.0.2.1.5",
     "author": "Camptocamp,ACSONE SA/NV,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/queue",
     "license": "LGPL-3",
diff --git a/queue_job/static/description/index.html b/queue_job/static/description/index.html
index ccf5d86df4..07e764c6ea 100644
--- a/queue_job/static/description/index.html
+++ b/queue_job/static/description/index.html
@@ -372,7 +372,7 @@ <h1>Job Queue</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:f8cd4a2bc31b48b3081573ba07c2396b47bb99f749d5125d10fcde512a987212
+!! source digest: sha256:e4d96f7742767c109795b5d35b5d39c393f95b249e97310c02a4a4c4da27487f
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Mature" src="https://img.shields.io/badge/maturity-Mature-brightgreen.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/license-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/queue/tree/19.0/queue_job"><img alt="OCA/queue" src="https://img.shields.io/badge/github-OCA%2Fqueue-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/queue-19-0/queue-19-0-queue_job"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/queue&amp;target_branch=19.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This addon adds an integrated Job Queue to Odoo.</p>

From 9857b58db423aa4fd47ab74153a71ac5a53cc6c6 Mon Sep 17 00:00:00 2001
From: GuillemCForgeFlow <guillem.casassas@forgeflow.com>
Date: Tue, 6 Oct 2026 14:14:35 +0200
Subject: [PATCH 5/8] [FIX] queue_job: don't start the jobrunner in odoo shell

odoo shell starts the server with stop=True and stops it right away, so the
runner thread was started for nothing and its START_DELAY made every shell
wait 5 seconds before the prompt. Core already skips its HTTP and cron threads
when stop is set; the runner now follows the same rule.
---
 queue_job/jobrunner/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queue_job/jobrunner/__init__.py b/queue_job/jobrunner/__init__.py
index 50dd45e39d..ffc6dd7b1e 100644
--- a/queue_job/jobrunner/__init__.py
+++ b/queue_job/jobrunner/__init__.py
@@ -151,7 +151,8 @@ def prefork_worker_pop(server, pid):
 
 def threaded_start(server, *args, **kwargs):
     res = orig_threaded_start(server, *args, **kwargs)
-    _start_runner_thread("threaded server")
+    if not kwargs.get("stop"):
+        _start_runner_thread("threaded server")
     return res
 
 

From 78b1bda4195a67004c90098f34bef1389f174d83 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 8 Oct 2026 13:08:19 +0000
Subject: [PATCH 6/8] [BOT] post-merge updates

---
 queue_job/README.rst                    | 2 +-
 queue_job/__manifest__.py               | 2 +-
 queue_job/static/description/index.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/queue_job/README.rst b/queue_job/README.rst
index d3b06da8ee..0163f6b404 100644
--- a/queue_job/README.rst
+++ b/queue_job/README.rst
@@ -11,7 +11,7 @@ Job Queue
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:e4d96f7742767c109795b5d35b5d39c393f95b249e97310c02a4a4c4da27487f
+   !! source digest: sha256:460e4b0b5d6e441724a1f52de8971e99adb543c530a8746134d0ad044070a9ea
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png
diff --git a/queue_job/__manifest__.py b/queue_job/__manifest__.py
index 2968232881..66c833e7f9 100644
--- a/queue_job/__manifest__.py
+++ b/queue_job/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     "name": "Job Queue",
-    "version": "19.0.2.1.5",
+    "version": "19.0.2.1.6",
     "author": "Camptocamp,ACSONE SA/NV,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/queue",
     "license": "LGPL-3",
diff --git a/queue_job/static/description/index.html b/queue_job/static/description/index.html
index 07e764c6ea..c37ea0f943 100644
--- a/queue_job/static/description/index.html
+++ b/queue_job/static/description/index.html
@@ -372,7 +372,7 @@ <h1>Job Queue</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:e4d96f7742767c109795b5d35b5d39c393f95b249e97310c02a4a4c4da27487f
+!! source digest: sha256:460e4b0b5d6e441724a1f52de8971e99adb543c530a8746134d0ad044070a9ea
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Mature" src="https://img.shields.io/badge/maturity-Mature-brightgreen.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/license-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/queue/tree/19.0/queue_job"><img alt="OCA/queue" src="https://img.shields.io/badge/github-OCA%2Fqueue-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/queue-19-0/queue-19-0-queue_job"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/queue&amp;target_branch=19.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This addon adds an integrated Job Queue to Odoo.</p>

From 52357dc67aeefdf83284cfc0476ae72018b65085 Mon Sep 17 00:00:00 2001
From: Dorin Hongu <dhongu@gmail.com>
Date: Fri, 16 Oct 2026 11:41:24 +0300
Subject: [PATCH 7/8] [IMP] queue_job: pre-commit auto fixes

---
 queue_job/delay.py                              |  4 ++--
 queue_job/jobrunner/__init__.py                 |  2 +-
 queue_job/jobrunner/channels.py                 |  2 +-
 queue_job/tests/common.py                       | 16 +++++++++-------
 queue_job/tests/test_run_job_controller_http.py |  1 -
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/queue_job/delay.py b/queue_job/delay.py
index 60e98dc9d6..8ce5d215be 100644
--- a/queue_job/delay.py
+++ b/queue_job/delay.py
@@ -314,7 +314,7 @@ class DelayableChain:
     delayable/chain/group object of the graph.
     """
 
-    __slots__ = ("_graph", "__head", "__tail")
+    __slots__ = ("__head", "__tail", "_graph")
 
     def __init__(self, *delayables):
         self._graph = DelayableGraph()
@@ -371,7 +371,7 @@ class DelayableGroup:
     delayable/chain/group object of the graph.
     """
 
-    __slots__ = ("_graph", "_delayables")
+    __slots__ = ("_delayables", "_graph")
 
     def __init__(self, *delayables):
         self._graph = DelayableGraph()
diff --git a/queue_job/jobrunner/__init__.py b/queue_job/jobrunner/__init__.py
index ffc6dd7b1e..3becb392d7 100644
--- a/queue_job/jobrunner/__init__.py
+++ b/queue_job/jobrunner/__init__.py
@@ -30,7 +30,7 @@
             queue_job_config = dict(cp["queue_job"])
 
 
-from .runner import QueueJobRunner, _channels  # noqa: E402
+from .runner import QueueJobRunner, _channels
 
 _logger = logging.getLogger(__name__)
 
diff --git a/queue_job/jobrunner/channels.py b/queue_job/jobrunner/channels.py
index bfc8984862..d88633ce3d 100644
--- a/queue_job/jobrunner/channels.py
+++ b/queue_job/jobrunner/channels.py
@@ -179,7 +179,7 @@ class ChannelJob:
 
     """
 
-    __slots__ = ("db_name", "channel", "uuid", "_sorting_key", "__weakref__")
+    __slots__ = ("__weakref__", "_sorting_key", "channel", "db_name", "uuid")
 
     def __init__(self, db_name, channel, uuid, seq, date_created, priority, eta):
         self.db_name = db_name
diff --git a/queue_job/tests/common.py b/queue_job/tests/common.py
index f74e4ad651..1499714e17 100644
--- a/queue_job/tests/common.py
+++ b/queue_job/tests/common.py
@@ -92,13 +92,15 @@ def button_that_uses_delayable_chain(self):
             # to the database)
             jobs_tester.perform_enqueued_jobs()
     """
-    with mock.patch(
-        "odoo.addons.queue_job.delay.Job",
-        name="Job Class",
-        unsafe=True,
-    ) as job_cls_mock:
-        with JobsTrap(job_cls_mock) as trap:
-            yield trap
+    with (
+        mock.patch(
+            "odoo.addons.queue_job.delay.Job",
+            name="Job Class",
+            unsafe=True,
+        ) as job_cls_mock,
+        JobsTrap(job_cls_mock) as trap,
+    ):
+        yield trap
 
 
 class JobCall(typing.NamedTuple):
diff --git a/queue_job/tests/test_run_job_controller_http.py b/queue_job/tests/test_run_job_controller_http.py
index 6aaa30d01c..bfcf561e03 100644
--- a/queue_job/tests/test_run_job_controller_http.py
+++ b/queue_job/tests/test_run_job_controller_http.py
@@ -39,7 +39,6 @@ def _capture_default_env_uid_at_acquire(self):
 
         def spy(cls, env, job_uuid):
             captured["default_env_uid"] = env.transaction.default_env.uid
-            return None
 
         with mock.patch.object(RunJobController, "_acquire_job", classmethod(spy)):
             response = self.url_open(

From 2b08ccdd93eab4406824e11adcbe6912ed89433b Mon Sep 17 00:00:00 2001
From: Dorin Hongu <dhongu@gmail.com>
Date: Sat, 26 Sep 2026 13:37:35 +0300
Subject: [PATCH 8/8] [MIG] queue_job: Migration to 20.0

- ir.model.access + ir.rule -> ir.access
- registry.clear_cache -> transaction.invalidate_ormcache
- controller: use odoo.sql_db.PG_CONCURRENCY_EXCEPTIONS_TO_RETRY
  (odoo.service.model was removed); env.clear() -> env.transaction.clear()
- jobrunner: odoo.modules.db.list_dbs (odoo.service.db was removed)
- fields: _setup_attrs -> _setup_attrs__; tools.ormcache -> api.ormcache
- JS: job_direct_graph widget ported to Owl 3 (useProps, signal ref);
  get_formview_action -> get_record_default_action (removed in 20.0)
- views: remaining_days widget -> relative_date; stat button icon
- tests: odoo.http.Request -> odoo.http.requestlib.Request
- lint fixes required by the 20.0 template (ruff 0.16, pylint-odoo 10)

Co-authored-by: Jared Kipe <jared@hibou.io>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .pre-commit-config.yaml                       |  7 +++
 queue_job/README.rst                          | 10 ++--
 queue_job/__manifest__.py                     |  6 +--
 queue_job/controllers/main.py                 | 15 +++---
 queue_job/data/queue_data.xml                 |  6 +--
 queue_job/data/queue_job_function_data.xml    |  1 +
 queue_job/delay.py                            |  2 +-
 queue_job/fields.py                           |  6 +--
 queue_job/job.py                              | 23 +++++-----
 queue_job/jobrunner/runner.py                 | 28 +++++------
 queue_job/models/queue_job.py                 |  9 ++--
 queue_job/models/queue_job_channel.py         |  2 +-
 queue_job/models/queue_job_function.py        | 15 +++---
 queue_job/security/ir.access.csv              |  9 ++++
 queue_job/security/ir.model.access.csv        |  8 ----
 queue_job/security/security.xml               | 46 +++++++------------
 queue_job/static/description/index.html       |  6 +--
 .../job_direct_graph/job_direct_graph.esm.js  | 46 ++++++++++---------
 .../job_direct_graph/job_direct_graph.xml     |  2 +-
 queue_job/tests/test_delayable_split.py       |  8 ++--
 queue_job/tests/test_json_field.py            |  4 +-
 .../tests/test_run_job_controller_http.py     |  5 +-
 queue_job/views/queue_job_channel_views.xml   |  2 +-
 queue_job/views/queue_job_function_views.xml  |  2 +-
 queue_job/views/queue_job_menus.xml           |  2 +-
 queue_job/views/queue_job_views.xml           |  6 +--
 .../wizards/queue_jobs_to_cancelled_views.xml |  2 +-
 .../wizards/queue_jobs_to_done_views.xml      |  2 +-
 queue_job/wizards/queue_requeue_job_views.xml |  2 +-
 29 files changed, 138 insertions(+), 144 deletions(-)
 create mode 100644 queue_job/security/ir.access.csv
 delete mode 100644 queue_job/security/ir.model.access.csv

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 02bbe150e5..cdbd3cf757 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,13 @@
 exclude: |
   (?x)
   # NOT INSTALLABLE ADDONS
+  ^base_import_async/|
+  ^queue_job_batch/|
+  ^queue_job_cron/|
+  ^queue_job_cron_jobrunner/|
+  ^queue_job_subscribe/|
+  ^test_queue_job/|
+  ^test_queue_job_batch/|
   # END NOT INSTALLABLE ADDONS
   # Files and folders generated by bots, to avoid loops
   ^setup/|/static/description/index\.html$|
diff --git a/queue_job/README.rst b/queue_job/README.rst
index 0163f6b404..bc7f8c0535 100644
--- a/queue_job/README.rst
+++ b/queue_job/README.rst
@@ -21,13 +21,13 @@ Job Queue
     :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
     :alt: License: LGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fqueue-lightgray.png?logo=github
-    :target: https://github.com/OCA/queue/tree/19.0/queue_job
+    :target: https://github.com/OCA/queue/tree/20.0/queue_job
     :alt: OCA/queue
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/queue-19-0/queue-19-0-queue_job
+    :target: https://translation.odoo-community.org/projects/queue-20-0/queue-20-0-queue_job
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/queue&target_branch=19.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/queue&target_branch=20.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -685,7 +685,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/queue/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/queue/issues/new?body=module:%20queue_job%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/queue/issues/new?body=module:%20queue_job%0Aversion:%2020.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -747,6 +747,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-guewen| |maintainer-sbidoul| 
 
-This module is part of the `OCA/queue <https://github.com/OCA/queue/tree/19.0/queue_job>`_ project on GitHub.
+This module is part of the `OCA/queue <https://github.com/OCA/queue/tree/20.0/queue_job>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/queue_job/__manifest__.py b/queue_job/__manifest__.py
index 66c833e7f9..c890beaf9c 100644
--- a/queue_job/__manifest__.py
+++ b/queue_job/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     "name": "Job Queue",
-    "version": "19.0.2.1.6",
+    "version": "20.0.1.0.0",
     "author": "Camptocamp,ACSONE SA/NV,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/queue",
     "license": "LGPL-3",
@@ -11,7 +11,7 @@
     "external_dependencies": {"python": ["requests", "openupgradelib"]},
     "data": [
         "security/security.xml",
-        "security/ir.model.access.csv",
+        "security/ir.access.csv",
         "views/queue_job_views.xml",
         "views/queue_job_channel_views.xml",
         "views/queue_job_function_views.xml",
@@ -27,7 +27,7 @@
             "queue_job/static/src/views/**/*",
         ],
     },
-    "installable": False,
+    "installable": True,
     "development_status": "Mature",
     "maintainers": ["guewen", "sbidoul"],
     "post_init_hook": "post_init_hook",
diff --git a/queue_job/controllers/main.py b/queue_job/controllers/main.py
index 706c02be79..ef0fa0baef 100644
--- a/queue_job/controllers/main.py
+++ b/queue_job/controllers/main.py
@@ -13,7 +13,7 @@
 from werkzeug.exceptions import BadRequest, Forbidden
 
 from odoo import SUPERUSER_ID, api, http
-from odoo.service.model import PG_CONCURRENCY_ERRORS_TO_RETRY
+from odoo.sql_db import PG_CONCURRENCY_EXCEPTIONS_TO_RETRY
 from odoo.tools import config
 
 from ..delay import chain, group
@@ -127,7 +127,7 @@ def _enqueue_dependent_jobs(cls, env, job):
             except OperationalError as err:
                 # Automatically retry the typical transaction serialization
                 # errors
-                if err.pgcode not in PG_CONCURRENCY_ERRORS_TO_RETRY:
+                if not isinstance(err, PG_CONCURRENCY_EXCEPTIONS_TO_RETRY):
                     raise
                 if tries >= DEPENDS_MAX_TRIES_ON_CONCURRENCY_FAILURE:
                     _logger.error(
@@ -152,7 +152,7 @@ def _enqueue_dependent_jobs(cls, env, job):
     @classmethod
     def _runjob(cls, env: api.Environment, job: Job) -> None:
         def retry_postpone(job, message, seconds=None):
-            job.env.clear()
+            job.env.transaction.clear()
             with job.in_temporary_env():
                 job.postpone(result=message, seconds=seconds)
                 job.set_pending(reset_retry=False)
@@ -164,7 +164,7 @@ def retry_postpone(job, message, seconds=None):
             except OperationalError as err:
                 # Automatically retry the typical transaction serialization
                 # errors
-                if err.pgcode not in PG_CONCURRENCY_ERRORS_TO_RETRY:
+                if not isinstance(err, PG_CONCURRENCY_EXCEPTIONS_TO_RETRY):
                     raise
 
                 _logger.debug("%s OperationalError, postponed", job)
@@ -185,7 +185,7 @@ def retry_postpone(job, message, seconds=None):
             traceback.print_exc(file=buff)
             traceback_txt = buff.getvalue()
             _logger.error(traceback_txt)
-            job.env.clear()
+            job.env.transaction.clear()
             with job.in_temporary_env():
                 vals = cls._get_failure_values(job, traceback_txt, orig_exception)
                 job.set_failed(**vals)
@@ -392,6 +392,5 @@ def _create_graph_test_jobs(
 
         root_delayable.delay()
 
-        return (
-            f"graph uuid: {list(root_delayable._head())[0]._generated_job.graph_uuid}"
-        )
+        head = next(iter(root_delayable._head()))
+        return f"graph uuid: {head._generated_job.graph_uuid}"
diff --git a/queue_job/data/queue_data.xml b/queue_job/data/queue_data.xml
index 1fb70f106c..39ed16189f 100644
--- a/queue_job/data/queue_data.xml
+++ b/queue_job/data/queue_data.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data noupdate="1">
         <!-- Queue-job-related subtypes for messaging / Chatter -->
@@ -12,14 +12,14 @@
             <field ref="model_queue_job" name="model_id" />
             <field eval="True" name="active" />
             <field name="user_id" ref="base.user_root" />
-            <field name="interval_number">1</field>
+            <field name="interval_number" eval="1" />
             <field name="interval_type">days</field>
             <field name="state">code</field>
             <field name="code">model.autovacuum()</field>
         </record>
     </data>
     <data noupdate="0">
-        <record model="queue.job.channel" id="channel_root">
+        <record id="channel_root" model="queue.job.channel">
             <field name="name">root</field>
         </record>
     </data>
diff --git a/queue_job/data/queue_job_function_data.xml b/queue_job/data/queue_job_function_data.xml
index 0105dbc508..31ec7ff964 100644
--- a/queue_job/data/queue_job_function_data.xml
+++ b/queue_job/data/queue_job_function_data.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo noupdate="1">
     <record id="job_function_queue_job__test_job" model="queue.job.function">
         <field name="model_id" ref="queue_job.model_queue_job" />
diff --git a/queue_job/delay.py b/queue_job/delay.py
index 8ce5d215be..8abc3133bc 100644
--- a/queue_job/delay.py
+++ b/queue_job/delay.py
@@ -58,7 +58,7 @@ class Graph:
     instances, although ultimately it is used for this purpose.
     """
 
-    __slots__ = "_graph"
+    __slots__ = ("_graph",)
 
     def __init__(self, graph=None):
         if graph:
diff --git a/queue_job/fields.py b/queue_job/fields.py
index bb5b6597ae..e2fcbdfe4a 100644
--- a/queue_job/fields.py
+++ b/queue_job/fields.py
@@ -30,7 +30,7 @@ class JobSerialized(fields.Json):
     _base_type = None
 
     # these are the default values when we convert an empty value
-    _default_json_mapping = {
+    _default_json_mapping = {  # noqa: RUF012
         dict: "{}",
         list: "[]",
         tuple: "[]",
@@ -42,8 +42,8 @@ class JobSerialized(fields.Json):
     def __init__(self, string=SENTINEL, base_type=SENTINEL, **kwargs):
         super().__init__(string=string, _base_type=base_type, **kwargs)
 
-    def _setup_attrs__(self, model, name):  # pylint: disable=missing-return
-        super()._setup_attrs__(model, name)
+    def _setup_attrs__(self, model_class, name):  # pylint: disable=missing-return
+        super()._setup_attrs__(model_class, name)
         if self._base_type not in self._default_json_mapping:
             msg = f"{self._base_type} is not a supported base type"
             raise ValueError(msg)
diff --git a/queue_job/job.py b/queue_job/job.py
index 04081976c5..c00f3590c2 100644
--- a/queue_job/job.py
+++ b/queue_job/job.py
@@ -461,7 +461,7 @@ def __init__(
         if self.priority is None:
             self.priority = DEFAULT_PRIORITY
 
-        self.date_created = datetime.now()
+        self.date_created = datetime.now()  # noqa: DTZ005
         self._description = description
 
         if isinstance(identity_key, str):
@@ -524,7 +524,7 @@ def perform(self):
             elif not self.max_retries:  # infinite retries
                 raise
             elif self.retry >= self.max_retries:
-                type_, value, traceback = sys.exc_info()
+                type_, value, _traceback = sys.exc_info()
                 # change the exception type but keep the original
                 # traceback and message:
                 # http://blog.ianbicking.org/2007/09/12/re-raising-exceptions/
@@ -745,9 +745,8 @@ def job_function_name(self):
 
     @property
     def identity_key(self):
-        if self._identity_key is None:
-            if self._identity_key_func:
-                self._identity_key = self._identity_key_func(self)
+        if self._identity_key is None and self._identity_key_func:
+            self._identity_key = self._identity_key_func(self)
         return self._identity_key
 
     @identity_key.setter
@@ -808,9 +807,9 @@ def eta(self, value):
         if not value:
             self._eta = None
         elif isinstance(value, timedelta):
-            self._eta = datetime.now() + value
+            self._eta = datetime.now() + value  # noqa: DTZ005
         elif isinstance(value, int):
-            self._eta = datetime.now() + timedelta(seconds=value)
+            self._eta = datetime.now() + timedelta(seconds=value)  # noqa: DTZ005
         else:
             self._eta = value
 
@@ -845,13 +844,13 @@ def set_pending(self, result=None, reset_retry=True):
 
     def set_enqueued(self):
         self.state = ENQUEUED
-        self.date_enqueued = datetime.now()
+        self.date_enqueued = datetime.now()  # noqa: DTZ005
         self.date_started = None
         self.worker_pid = None
 
     def set_started(self):
         self.state = STARTED
-        self.date_started = datetime.now()
+        self.date_started = datetime.now()  # noqa: DTZ005
         self.worker_pid = os.getpid()
         self.add_lock_record()
 
@@ -859,13 +858,13 @@ def set_done(self, result=None):
         self.state = DONE
         self.exc_name = None
         self.exc_info = None
-        self.date_done = datetime.now()
+        self.date_done = datetime.now()  # noqa: DTZ005
         if result is not None:
             self.result = result
 
     def set_cancelled(self, result=None):
         self.state = CANCELLED
-        self.date_cancelled = datetime.now()
+        self.date_cancelled = datetime.now()  # noqa: DTZ005
         if result is not None:
             self.result = result
 
@@ -925,7 +924,7 @@ def related_action(self):
         if not funcname:
             funcname = record._default_related_action
         if not isinstance(funcname, str):
-            raise ValueError(
+            raise ValueError(  # noqa: TRY004
                 "related_action must be the name of the method on queue.job as string"
             )
         action = getattr(record, funcname)
diff --git a/queue_job/jobrunner/runner.py b/queue_job/jobrunner/runner.py
index 6ff2e2f260..65e556a6e8 100644
--- a/queue_job/jobrunner/runner.py
+++ b/queue_job/jobrunner/runner.py
@@ -31,6 +31,7 @@
 from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
 
 import odoo
+from odoo.modules.db import list_dbs
 from odoo.tools import config
 
 from . import queue_job_config
@@ -72,7 +73,7 @@ def _odoo_now():
 
 
 def _connection_info_for(db_name):
-    db_or_uri, connection_info = odoo.sql_db.connection_info_for(db_name)
+    _db_or_uri, connection_info = odoo.sql_db.connection_info_for(db_name)
 
     for p in ("host", "port", "user", "password"):
         cfg = os.environ.get(
@@ -139,7 +140,7 @@ def close(self):
         # del
         try:
             self.conn.close()
-        except Exception:
+        except Exception:  # noqa: BLE001, S110
             pass
         self.conn = None
 
@@ -382,7 +383,7 @@ def get_db_names(self):
         db_names = config["db_name"]
         if db_names:
             return db_names
-        return odoo.service.db.list_dbs(True)
+        return list_dbs(force=True)
 
     def close_databases(self, remove_jobs=True):
         for db_name, db in self.db_by_name.items():
@@ -474,17 +475,16 @@ def wait_notification(self):
         # if timeout remains a large negative number, it is most
         # probably a bug
         _logger.debug("select() timeout: %.2f sec", timeout)
-        if timeout > 0:
-            if conns and not self._stop:
-                with select() as sel:
-                    for conn in conns:
-                        sel.register(conn, selectors.EVENT_READ)
-                    events = sel.select(timeout=timeout)
-                    for key, _mask in events:
-                        if key.fileobj == self._stop_pipe[0]:
-                            # stop-pipe is not a conn so doesn't need poll()
-                            continue
-                        key.fileobj.poll()
+        if timeout > 0 and conns and not self._stop:
+            with select() as sel:
+                for conn in conns:
+                    sel.register(conn, selectors.EVENT_READ)
+                events = sel.select(timeout=timeout)
+                for key, _mask in events:
+                    if key.fileobj == self._stop_pipe[0]:
+                        # stop-pipe is not a conn so doesn't need poll()
+                        continue
+                    key.fileobj.poll()
 
     def stop(self):
         _logger.info("graceful stop requested")
diff --git a/queue_job/models/queue_job.py b/queue_job/models/queue_job.py
index 23cf5de370..013dc16c8c 100644
--- a/queue_job/models/queue_job.py
+++ b/queue_job/models/queue_job.py
@@ -35,7 +35,7 @@ class QueueJob(models.Model):
 
     _name = "queue.job"
     _description = "Queue Job"
-    _inherit = ["mail.thread", "mail.activity.mixin"]
+    _inherit = ["mail.thread", "mail.activity.mixin"]  # noqa: RUF012
     _log_access = False
 
     _order = "date_created DESC, date_done DESC"
@@ -70,9 +70,7 @@ class QueueJob(models.Model):
         help="Single shared identifier of a Graph. Empty for a single job.",
     )
     user_id = fields.Many2one(comodel_name="res.users", string="User ID")
-    company_id = fields.Many2one(
-        comodel_name="res.company", string="Company", index=True
-    )
+    company_id = fields.Many2one(comodel_name="res.company", index=True)
     name = fields.Char(string="Description", readonly=True)
 
     model_name = fields.Char(string="Model", readonly=True)
@@ -121,7 +119,6 @@ class QueueJob(models.Model):
     channel_method_name = fields.Char(string="Complete Method Name", readonly=True)
     job_function_id = fields.Many2one(
         comodel_name="queue.job.function",
-        string="Job Function",
         readonly=True,
     )
 
@@ -415,7 +412,7 @@ def autovacuum(self):
         Called from a cron.
         """
         for channel in self.env["queue.job.channel"].search([]):  # pylint: disable=no-search-all
-            deadline = datetime.now() - timedelta(days=int(channel.removal_interval))
+            deadline = datetime.now() - timedelta(days=int(channel.removal_interval))  # noqa: DTZ005
             # Delete in chunks using a stable order (matches composite index)
             while True:
                 jobs = self.search(
diff --git a/queue_job/models/queue_job_channel.py b/queue_job/models/queue_job_channel.py
index 0a5c1c917b..ee5f7588fe 100644
--- a/queue_job/models/queue_job_channel.py
+++ b/queue_job/models/queue_job_channel.py
@@ -37,7 +37,7 @@ def _compute_complete_name(self):
             if not record.name:
                 complete_name = ""  # new record
             elif record.parent_id:
-                complete_name = ".".join([record.parent_id.complete_name, record.name])
+                complete_name = f"{record.parent_id.complete_name}.{record.name}"
             else:
                 complete_name = record.name
             record.complete_name = complete_name
diff --git a/queue_job/models/queue_job_function.py b/queue_job/models/queue_job_function.py
index 872f5831f0..d574753593 100644
--- a/queue_job/models/queue_job_function.py
+++ b/queue_job/models/queue_job_function.py
@@ -6,7 +6,7 @@
 import re
 from collections import namedtuple
 
-from odoo import api, exceptions, fields, models, tools
+from odoo import api, exceptions, fields, models
 
 from ..fields import JobSerialized
 
@@ -45,9 +45,7 @@ def _default_channel(self):
 
     # model and method should be required, but the required flag doesn't
     # let a chance to _inverse_name to be executed
-    model_id = fields.Many2one(
-        comodel_name="ir.model", string="Model", ondelete="cascade"
-    )
+    model_id = fields.Many2one(comodel_name="ir.model", ondelete="cascade")
     method = fields.Char()
     on_fail_method = fields.Char(
         help="Model function to be called if the job is failed and will not be "
@@ -56,7 +54,6 @@ def _default_channel(self):
 
     channel_id = fields.Many2one(
         comodel_name="queue.job.channel",
-        string="Channel",
         required=True,
         default=lambda r: r._default_channel(),
     )
@@ -187,7 +184,7 @@ def _parse_retry_pattern(self):
             retry_pattern = {}
         return retry_pattern
 
-    @tools.ormcache("name")
+    @api.ormcache("name")
     def job_config(self, name):
         config = self.search([("name", "=", name)], limit=1)
         if not config:
@@ -279,15 +276,15 @@ def create(self, vals_list):
                 new_vals_list.append(vals)
             vals_list = new_vals_list
         records |= super().create(vals_list)
-        self.env.registry.clear_cache()
+        self.env.transaction.invalidate_ormcache()
         return records
 
     def write(self, values):
         res = super().write(values)
-        self.env.registry.clear_cache()
+        self.env.transaction.invalidate_ormcache()
         return res
 
     def unlink(self):
         res = super().unlink()
-        self.env.registry.clear_cache()
+        self.env.transaction.invalidate_ormcache()
         return res
diff --git a/queue_job/security/ir.access.csv b/queue_job/security/ir.access.csv
new file mode 100644
index 0000000000..ae56a64612
--- /dev/null
+++ b/queue_job/security/ir.access.csv
@@ -0,0 +1,9 @@
+id,name,model_id,group_id/id,operation,domain
+access_queue_job_manager,queue job manager,queue.job,queue_job.group_queue_job_manager,ru,
+queue_job_comp_rule,Job Queue multi-company,queue.job,,crud,"['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]"
+access_queue_job_lock_manager,queue job lock manager,queue.job.lock,queue_job.group_queue_job_manager,r,
+access_queue_job_function_manager,queue job functions manager,queue.job.function,queue_job.group_queue_job_manager,crud,
+access_queue_job_channel_manager,queue job channel manager,queue.job.channel,queue_job.group_queue_job_manager,crud,
+access_queue_requeue_job,queue requeue job manager,queue.requeue.job,queue_job.group_queue_job_manager,crud,
+access_queue_jobs_to_done,queue jobs to done manager,queue.jobs.to.done,queue_job.group_queue_job_manager,crud,
+access_queue_jobs_to_cancelled,queue jobs to cancelled manager,queue.jobs.to.cancelled,queue_job.group_queue_job_manager,crud,
diff --git a/queue_job/security/ir.model.access.csv b/queue_job/security/ir.model.access.csv
deleted file mode 100644
index 9a451d6a78..0000000000
--- a/queue_job/security/ir.model.access.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_queue_job_manager,queue job manager,queue_job.model_queue_job,queue_job.group_queue_job_manager,1,1,0,0
-access_queue_job_lock_manager,queue job lock manager,queue_job.model_queue_job_lock,queue_job.group_queue_job_manager,1,0,0,0
-access_queue_job_function_manager,queue job functions manager,queue_job.model_queue_job_function,queue_job.group_queue_job_manager,1,1,1,1
-access_queue_job_channel_manager,queue job channel manager,queue_job.model_queue_job_channel,queue_job.group_queue_job_manager,1,1,1,1
-access_queue_requeue_job,queue requeue job manager,queue_job.model_queue_requeue_job,queue_job.group_queue_job_manager,1,1,1,1
-access_queue_jobs_to_done,queue jobs to done manager,queue_job.model_queue_jobs_to_done,queue_job.group_queue_job_manager,1,1,1,1
-access_queue_jobs_to_cancelled,queue jobs to cancelled manager,queue_job.model_queue_jobs_to_cancelled,queue_job.group_queue_job_manager,1,1,1,1
diff --git a/queue_job/security/security.xml b/queue_job/security/security.xml
index 740226988e..b4bf2549e9 100644
--- a/queue_job/security/security.xml
+++ b/queue_job/security/security.xml
@@ -1,31 +1,19 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <data>
-        <record model="res.groups.privilege" id="privilege_queue_job">
-            <field name="name">Job Queue</field>
-            <field name="sequence">50</field>
-        </record>
-        <record model="ir.module.category" id="module_category_queue_job">
-            <field name="name">Job Queue</field>
-            <field name="sequence">20</field>
-        </record>
-        <record id="group_queue_job_manager" model="res.groups">
-            <field name="name">Job Queue Manager</field>
-            <field name="privilege_id" ref="privilege_queue_job" />
-            <field
-                name="user_ids"
-                eval="[Command.link(ref('base.user_root')), Command.link(ref('base.user_admin'))]"
-            />
-        </record>
-    </data>
-    <data noupdate="1">
-        <record id="queue_job_comp_rule" model="ir.rule">
-            <field name="name">Job Queue multi-company</field>
-            <field name="model_id" ref="model_queue_job" />
-            <field name="global" eval="True" />
-            <field
-                name="domain_force"
-            >['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
-        </record>
-    </data>
+    <record id="privilege_queue_job" model="res.groups.privilege">
+        <field name="name">Job Queue</field>
+        <field name="sequence" eval="50" />
+    </record>
+    <record id="module_category_queue_job" model="ir.module.category">
+        <field name="name">Job Queue</field>
+        <field name="sequence" eval="20" />
+    </record>
+    <record id="group_queue_job_manager" model="res.groups">
+        <field name="name">Job Queue Manager</field>
+        <field name="privilege_id" ref="privilege_queue_job" />
+        <field
+            name="user_ids"
+            eval="[Command.link(ref('base.user_root')), Command.link(ref('base.user_admin'))]"
+        />
+    </record>
 </odoo>
diff --git a/queue_job/static/description/index.html b/queue_job/static/description/index.html
index c37ea0f943..deba532da9 100644
--- a/queue_job/static/description/index.html
+++ b/queue_job/static/description/index.html
@@ -374,7 +374,7 @@ <h1>Job Queue</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:460e4b0b5d6e441724a1f52de8971e99adb543c530a8746134d0ad044070a9ea
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Mature" src="https://img.shields.io/badge/maturity-Mature-brightgreen.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/license-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/queue/tree/19.0/queue_job"><img alt="OCA/queue" src="https://img.shields.io/badge/github-OCA%2Fqueue-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/queue-19-0/queue-19-0-queue_job"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/queue&amp;target_branch=19.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Mature" src="https://img.shields.io/badge/maturity-Mature-brightgreen.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/license-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/queue/tree/20.0/queue_job"><img alt="OCA/queue" src="https://img.shields.io/badge/github-OCA%2Fqueue-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/queue-20-0/queue-20-0-queue_job"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/queue&amp;target_branch=20.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This addon adds an integrated Job Queue to Odoo.</p>
 <p>It allows to postpone method calls executed asynchronously.</p>
 <p>Jobs are executed in the background by a <tt class="docutils literal">Jobrunner</tt>, in their own
@@ -987,7 +987,7 @@ <h2><a class="toc-backref" href="#toc-entry-15">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/queue/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/queue/issues/new?body=module:%20queue_job%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/queue/issues/new?body=module:%20queue_job%0Aversion:%2020.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -1035,7 +1035,7 @@ <h3><a class="toc-backref" href="#toc-entry-20">Maintainers</a></h3>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/guewen"><img alt="guewen" src="https://github.com/guewen.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/sbidoul"><img alt="sbidoul" src="https://github.com/sbidoul.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/queue/tree/19.0/queue_job">OCA/queue</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/queue/tree/20.0/queue_job">OCA/queue</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
diff --git a/queue_job/static/src/views/fields/job_direct_graph/job_direct_graph.esm.js b/queue_job/static/src/views/fields/job_direct_graph/job_direct_graph.esm.js
index c9b69acebb..35bc69fa54 100644
--- a/queue_job/static/src/views/fields/job_direct_graph/job_direct_graph.esm.js
+++ b/queue_job/static/src/views/fields/job_direct_graph/job_direct_graph.esm.js
@@ -1,46 +1,50 @@
-/* @odoo-module */
 /* global vis */
 
+import {
+    Component,
+    onMounted,
+    onWillStart,
+    onWillUnmount,
+    signal,
+    usePlugin,
+    useProps,
+} from "@odoo/owl";
 import {loadCSS, loadJS} from "@web/core/assets";
+import {ActionPlugin} from "@web/webclient/actions/action_plugin";
 import {registry} from "@web/core/registry";
 import {standardFieldProps} from "@web/views/fields/standard_field_props";
 import {useService} from "@web/core/utils/hooks";
 
-const {Component, onWillStart, useEffect, useRef} = owl;
-
 const {document} = globalThis;
 
 class JobDirectGraph extends Component {
-    static props = {...standardFieldProps};
     static template = "queue.JobDirectGraph";
+    props = useProps({...standardFieldProps});
+    rootRef = signal.ref();
 
     setup() {
         this.orm = useService("orm");
-        this.action = useService("action");
-        this.rootRef = useRef("root_vis");
+        this.action = usePlugin(ActionPlugin);
         this.network = null;
         this.forceRender = false;
         onWillStart(async () => {
             await loadJS("/queue_job/static/lib/vis/vis-network.min.js");
             loadCSS("/queue_job/static/lib/vis/vis-network.min.css");
         });
-        useEffect(
-            () => {
-                this.renderNetwork();
-                this._fitNetwork();
-                return () => {
-                    if (this.network) {
-                        this.$el.innerHTML = "";
-                    }
-                    return this.rootRef.el;
-                };
-            },
-            () => []
-        );
+        // Owl 2 useEffect(..., () => []): run once when mounted, clean on unmount
+        onMounted(() => {
+            this.renderNetwork();
+            this._fitNetwork();
+        });
+        onWillUnmount(() => {
+            if (this.network && this.$el) {
+                this.$el.innerHTML = "";
+            }
+        });
     }
 
     get $el() {
-        return this.rootRef.el;
+        return this.rootRef();
     }
 
     get resId() {
@@ -154,7 +158,7 @@ class JobDirectGraph extends Component {
     async openDependencyJob(resId) {
         const action = await this.orm.call(
             this.model,
-            "get_formview_action",
+            "get_record_default_action",
             [[resId]],
             {
                 context: this.context,
diff --git a/queue_job/static/src/views/fields/job_direct_graph/job_direct_graph.xml b/queue_job/static/src/views/fields/job_direct_graph/job_direct_graph.xml
index cd27cb16c4..08e2f4e396 100644
--- a/queue_job/static/src/views/fields/job_direct_graph/job_direct_graph.xml
+++ b/queue_job/static/src/views/fields/job_direct_graph/job_direct_graph.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
 
     <t t-name="queue.JobDirectGraph">
-        <div id="props.id" t-ref="root_vis" class="root_vis" />
+        <div id="props.id" t-ref="this.rootRef" class="root_vis" />
     </t>
 
 </templates>
diff --git a/queue_job/tests/test_delayable_split.py b/queue_job/tests/test_delayable_split.py
index 25fd9c3ebc..321801bcc4 100644
--- a/queue_job/tests/test_delayable_split.py
+++ b/queue_job/tests/test_delayable_split.py
@@ -43,7 +43,7 @@ def test_delayable_split_10_3(self):
         dl.method("arg", kwarg="kwarg")
         group = dl.split(3)
         self.assertEqual(len(group._delayables), 4)
-        delayables = sorted(list(group._delayables), key=lambda x: x.description)
+        delayables = sorted(group._delayables, key=lambda x: x.description)
         self.assertEqual(delayables[0].recordset, self.FakeRecordSet([0, 1, 2]))
         self.assertEqual(delayables[1].recordset, self.FakeRecordSet([3, 4, 5]))
         self.assertEqual(delayables[2].recordset, self.FakeRecordSet([6, 7, 8]))
@@ -75,7 +75,7 @@ def test_delayable_split_10_5(self):
         dl.method("arg", kwarg="kwarg")
         group = dl.split(5)
         self.assertEqual(len(group._delayables), 2)
-        delayables = sorted(list(group._delayables), key=lambda x: x.description)
+        delayables = sorted(group._delayables, key=lambda x: x.description)
         self.assertEqual(delayables[0].recordset, self.FakeRecordSet([0, 1, 2, 3, 4]))
         self.assertEqual(delayables[1].recordset, self.FakeRecordSet([5, 6, 7, 8, 9]))
         self.assertEqual(delayables[0].description, "Method to be called (split 1/2)")
@@ -87,7 +87,7 @@ def test_delayable_split_10_10(self):
         dl.method("arg", kwarg="kwarg")
         group = dl.split(10)
         self.assertEqual(len(group._delayables), 1)
-        delayables = sorted(list(group._delayables), key=lambda x: x.description)
+        delayables = sorted(group._delayables, key=lambda x: x.description)
         self.assertEqual(delayables[0].recordset, self.FakeRecordSet(range(10)))
         self.assertEqual(delayables[0].description, "Method to be called (split 1/1)")
         self._cancel_delayables(*group._delayables)
@@ -97,7 +97,7 @@ def test_delayable_split_10_20(self):
         dl.method("arg", kwarg="kwarg")
         group = dl.split(20)
         self.assertEqual(len(group._delayables), 1)
-        delayables = sorted(list(group._delayables), key=lambda x: x.description)
+        delayables = sorted(group._delayables, key=lambda x: x.description)
         self.assertEqual(delayables[0].recordset, self.FakeRecordSet(range(10)))
         self.assertEqual(delayables[0].description, "Method to be called (split 1/1)")
         self._cancel_delayables(*group._delayables)
diff --git a/queue_job/tests/test_json_field.py b/queue_job/tests/test_json_field.py
index 2f7c886f14..fda6b9eb7a 100644
--- a/queue_job/tests/test_json_field.py
+++ b/queue_job/tests/test_json_field.py
@@ -141,7 +141,7 @@ def test_decoder_recordset_list_without_user(self):
         self.assertEqual(value, expected)
 
     def test_encoder_datetime(self):
-        value = ["a", 1, datetime(2017, 4, 19, 8, 48, 50, 1)]
+        value = ["a", 1, datetime(2017, 4, 19, 8, 48, 50, 1)]  # noqa: DTZ001
         value_json = json.dumps(value, cls=JobEncoder)
         expected = [
             "a",
@@ -155,7 +155,7 @@ def test_decoder_datetime(self):
             '["a", 1, {"_type": "datetime_isoformat",'
             '"value": "2017-04-19T08:48:50.000001"}]'
         )
-        expected = ["a", 1, datetime(2017, 4, 19, 8, 48, 50, 1)]
+        expected = ["a", 1, datetime(2017, 4, 19, 8, 48, 50, 1)]  # noqa: DTZ001
         value = json.loads(value_json, cls=JobDecoder, env=self.env)
         self.assertEqual(value, expected)
 
diff --git a/queue_job/tests/test_run_job_controller_http.py b/queue_job/tests/test_run_job_controller_http.py
index bfcf561e03..3bd660d485 100644
--- a/queue_job/tests/test_run_job_controller_http.py
+++ b/queue_job/tests/test_run_job_controller_http.py
@@ -2,7 +2,8 @@
 
 from unittest import mock
 
-from odoo import SUPERUSER_ID, http
+from odoo import SUPERUSER_ID
+from odoo.http.requestlib import Request
 from odoo.tests.common import HttpCase, tagged
 
 from ..controllers.main import RunJobController
@@ -78,7 +79,7 @@ def no_op_update_env(self_, user=None, context=None, su=None):
             update its environment.
             """
 
-        with mock.patch.object(http.Request, "update_env", no_op_update_env):
+        with mock.patch.object(Request, "update_env", no_op_update_env):
             default_env_uid = self._capture_default_env_uid_at_acquire()
 
         self.assertIsNone(default_env_uid)
diff --git a/queue_job/views/queue_job_channel_views.xml b/queue_job/views/queue_job_channel_views.xml
index 50c245716b..465196704c 100644
--- a/queue_job/views/queue_job_channel_views.xml
+++ b/queue_job/views/queue_job_channel_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <record id="view_queue_job_channel_form" model="ir.ui.view">
         <field name="name">queue.job.channel.form</field>
diff --git a/queue_job/views/queue_job_function_views.xml b/queue_job/views/queue_job_function_views.xml
index ca481f5777..4667968ceb 100644
--- a/queue_job/views/queue_job_function_views.xml
+++ b/queue_job/views/queue_job_function_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <record id="view_queue_job_function_form" model="ir.ui.view">
         <field name="name">queue.job.function.form</field>
diff --git a/queue_job/views/queue_job_menus.xml b/queue_job/views/queue_job_menus.xml
index 8142605de9..86ea61592b 100644
--- a/queue_job/views/queue_job_menus.xml
+++ b/queue_job/views/queue_job_menus.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <menuitem
         id="menu_queue_job_root"
diff --git a/queue_job/views/queue_job_views.xml b/queue_job/views/queue_job_views.xml
index 83a11498da..b7626e1e50 100644
--- a/queue_job/views/queue_job_views.xml
+++ b/queue_job/views/queue_job_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <record id="view_queue_job_form" model="ir.ui.view">
         <field name="name">queue.job.form</field>
@@ -44,7 +44,7 @@
                             name="open_graph_jobs"
                             type="object"
                             class="oe_stat_button"
-                            icon="fa-sitemap"
+                            icon="account_tree"
                             invisible="graph_uuid == False"
                         >
                             <field
@@ -156,7 +156,7 @@
                 <field name="date_created" />
                 <field
                     name="eta"
-                    widget="remaining_days"
+                    widget="relative_date"
                     string="Remaining days to execute"
                     optional="hide"
                 />
diff --git a/queue_job/wizards/queue_jobs_to_cancelled_views.xml b/queue_job/wizards/queue_jobs_to_cancelled_views.xml
index c501cf21b5..c4c05ad7f1 100644
--- a/queue_job/wizards/queue_jobs_to_cancelled_views.xml
+++ b/queue_job/wizards/queue_jobs_to_cancelled_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <record id="view_set_jobs_cancelled" model="ir.ui.view">
         <field name="name">Cancel Jobs</field>
diff --git a/queue_job/wizards/queue_jobs_to_done_views.xml b/queue_job/wizards/queue_jobs_to_done_views.xml
index 6bc6653327..5678ae7099 100644
--- a/queue_job/wizards/queue_jobs_to_done_views.xml
+++ b/queue_job/wizards/queue_jobs_to_done_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <record id="view_set_jobs_done" model="ir.ui.view">
         <field name="name">Set Jobs to Done</field>
diff --git a/queue_job/wizards/queue_requeue_job_views.xml b/queue_job/wizards/queue_requeue_job_views.xml
index cfad7879c0..7836ed5274 100644
--- a/queue_job/wizards/queue_requeue_job_views.xml
+++ b/queue_job/wizards/queue_requeue_job_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <record id="view_requeue_job" model="ir.ui.view">
         <field name="name">Requeue Jobs</field>