From e7a9326b9d957d1788aa3c4a4b77f6295ff84808 Mon Sep 17 00:00:00 2001 From: Milan Topuzov Date: Wed, 1 Oct 2025 19:38:00 +0200 Subject: [PATCH 1/6] [19.0] queue_job_batch: migrate + tests Scope: queue_job_batch, test_queue_job_batch only --- queue_job_batch/README.rst | 16 ++++--- queue_job_batch/__manifest__.py | 7 ++-- queue_job_batch/security/security.xml | 3 +- queue_job_batch/static/description/index.html | 42 +++++++++++-------- .../views/queue_job_batch_views.xml | 23 +++------- test_queue_job_batch/README.rst | 16 ++++--- test_queue_job_batch/__manifest__.py | 5 +-- .../static/description/index.html | 30 +++++++------ 8 files changed, 75 insertions(+), 67 deletions(-) diff --git a/queue_job_batch/README.rst b/queue_job_batch/README.rst index d0b9d22c38..dbf9599f8c 100644 --- a/queue_job_batch/README.rst +++ b/queue_job_batch/README.rst @@ -1,3 +1,7 @@ +.. image:: https://odoo-community.org/readme-banner-image + :target: https://odoo-community.org/get-involved?utm_source=readme + :alt: Odoo Community Association + =============== Job Queue Batch =============== @@ -13,17 +17,17 @@ Job Queue Batch .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status :alt: Beta -.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png +.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fqueue-lightgray.png?logo=github - :target: https://github.com/OCA/queue/tree/18.0/queue_job_batch + :target: https://github.com/OCA/queue/tree/19.0/queue_job_batch :alt: OCA/queue .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/queue-18-0/queue-18-0-queue_job_batch + :target: https://translation.odoo-community.org/projects/queue-19-0/queue-19-0-queue_job_batch :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=18.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/queue&target_branch=19.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -82,7 +86,7 @@ Bug Tracker Bugs are tracked on `GitHub 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -132,6 +136,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/queue `_ project on GitHub. +This module is part of the `OCA/queue `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/queue_job_batch/__manifest__.py b/queue_job_batch/__manifest__.py index 12dc679b8f..f8a64d20ef 100644 --- a/queue_job_batch/__manifest__.py +++ b/queue_job_batch/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Job Queue Batch", - "version": "18.0.1.0.0", + "version": "19.0.1.0.0", "author": "Creu Blanca,Odoo Community Association (OCA)", "website": "https://github.com/OCA/queue", "license": "AGPL-3", @@ -29,7 +29,6 @@ "queue_job_batch/static/src/**/*.xml", "queue_job_batch/static/src/**/*.scss", ], - 'installable': False, -}, - 'installable': False, + }, + "installable": True, } diff --git a/queue_job_batch/security/security.xml b/queue_job_batch/security/security.xml index 9443708ae0..7279ba77d1 100644 --- a/queue_job_batch/security/security.xml +++ b/queue_job_batch/security/security.xml @@ -3,7 +3,8 @@ Job Queue Batch User - + + -Job Queue Batch +README.rst -
-

Job Queue Batch

+
+ + +Odoo Community Association + +
+

Job Queue Batch

-

Beta License: AGPL-3 OCA/queue Translate me on Weblate Try me on Runboat

+

Beta License: AGPL-3 OCA/queue Translate me on Weblate Try me on Runboat

This addon adds an a grouper for queue jobs.

It allows to show your jobs in a batched form in order to know better the results.

Example:

-from odoo import models, fields, api
+from odoo import models, fields, api
 
 
-class MyModel(models.Model):
+class MyModel(models.Model):
     _name = 'my.model'
 
-    def my_method(self, a, k=None):
+    def my_method(self, a, k=None):
         _logger.info('executed with a: %s and k: %s', a, k)
 
 
-class MyOtherModel(models.Model):
+class MyOtherModel(models.Model):
     _name = 'my.other.model'
 
     @api.multi
-    def button_do_stuff(self):
+    def button_do_stuff(self):
         batch = self.env['queue.job.batch'].get_new_batch('Group')
         model = self.env['my.model'].with_context(job_batch=batch)
         for i in range(1, 100):
@@ -415,29 +420,29 @@ 
Job Queue Batch
-

Usage

+

Usage

You can manage your batch jobs from the Systray. A new button will be shown with your currently executing job batches and the recently finished job groups.

-

Bug Tracker

+

Bug Tracker

Bugs are tracked on GitHub 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.

+feedback.

Do not contact contributors directly about support or help with technical issues.

-

Credits

+

Credits

-

Authors

+

Authors

  • Creu Blanca
-

Contributors

+

Contributors

-

Other credits

+

Other credits

The migration of this module from 12.0 to 14.0 was financially supported by Camptocamp

-

Maintainers

+

Maintainers

This module is maintained by the OCA.

Odoo Community Association @@ -470,10 +475,11 @@

Maintainers

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/queue project on GitHub.

+

This module is part of the OCA/queue project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
diff --git a/queue_job_batch/views/queue_job_batch_views.xml b/queue_job_batch/views/queue_job_batch_views.xml index 34bdc1fee3..b3a5cdc510 100644 --- a/queue_job_batch/views/queue_job_batch_views.xml +++ b/queue_job_batch/views/queue_job_batch_views.xml @@ -64,11 +64,8 @@ - + + - - - - + + + + diff --git a/test_queue_job_batch/README.rst b/test_queue_job_batch/README.rst index 6c2f32a04b..50c6202efe 100644 --- a/test_queue_job_batch/README.rst +++ b/test_queue_job_batch/README.rst @@ -1,3 +1,7 @@ +.. image:: https://odoo-community.org/readme-banner-image + :target: https://odoo-community.org/get-involved?utm_source=readme + :alt: Odoo Community Association + ==================== Test Job Queue Batch ==================== @@ -13,17 +17,17 @@ Test Job Queue Batch .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status :alt: Beta -.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png +.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fqueue-lightgray.png?logo=github - :target: https://github.com/OCA/queue/tree/18.0/test_queue_job_batch + :target: https://github.com/OCA/queue/tree/19.0/test_queue_job_batch :alt: OCA/queue .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/queue-18-0/queue-18-0-test_queue_job_batch + :target: https://translation.odoo-community.org/projects/queue-19-0/queue-19-0-test_queue_job_batch :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=18.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/queue&target_branch=19.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -41,7 +45,7 @@ Bug Tracker Bugs are tracked on `GitHub 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -83,6 +87,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/queue `_ project on GitHub. +This module is part of the `OCA/queue `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/test_queue_job_batch/__manifest__.py b/test_queue_job_batch/__manifest__.py index e0d6eb85ab..11127b0575 100644 --- a/test_queue_job_batch/__manifest__.py +++ b/test_queue_job_batch/__manifest__.py @@ -1,9 +1,8 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) - { "name": "Test Job Queue Batch", - "version": "18.0.1.0.0", + "version": "19.0.1.0.0", "author": "Creu Blanca,Odoo Community Association (OCA)", "website": "https://github.com/OCA/queue", "license": "AGPL-3", @@ -12,5 +11,5 @@ "queue_job_batch", "test_queue_job", ], - 'installable': False, + "installable": True, } diff --git a/test_queue_job_batch/static/description/index.html b/test_queue_job_batch/static/description/index.html index 6bdb598296..f8821cdc7a 100644 --- a/test_queue_job_batch/static/description/index.html +++ b/test_queue_job_batch/static/description/index.html @@ -3,7 +3,7 @@ -Test Job Queue Batch +README.rst -
-

Test Job Queue Batch

+
+ + +Odoo Community Association + +
+

Test Job Queue Batch

-

Beta License: AGPL-3 OCA/queue Translate me on Weblate Try me on Runboat

+

Beta License: AGPL-3 OCA/queue Translate me on Weblate Try me on Runboat

This addon is used to test the queue job batch functionality

Table of contents

@@ -385,23 +390,23 @@

Test Job Queue Batch

-

Bug Tracker

+

Bug Tracker

Bugs are tracked on GitHub 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.

+feedback.

Do not contact contributors directly about support or help with technical issues.

-

Credits

+

Credits

-

Authors

+

Authors

  • Creu Blanca
-

Contributors

+

Contributors

-

Other credits

+

Other credits

The migration of this module from 12.0 to 14.0 was financially supported by Camptocamp

-

Maintainers

+

Maintainers

This module is maintained by the OCA.

Odoo Community Association @@ -425,10 +430,11 @@

Maintainers

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/queue project on GitHub.

+

This module is part of the OCA/queue project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
From f4a5c962a80ecdeadba66b30b454d2d82c350239 Mon Sep 17 00:00:00 2001 From: Milan Topuzov Date: Wed, 1 Oct 2025 19:38:00 +0200 Subject: [PATCH 2/6] [DON'T MERGE] test-requirements.txt --- test-requirements.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 test-requirements.txt diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 0000000000..dca911c655 --- /dev/null +++ b/test-requirements.txt @@ -0,0 +1,2 @@ +odoo-addon-queue_job @ git+https://github.com/OCA/queue.git@refs/pull/840/head#subdirectory=queue_job +odoo-addon-test_queue_job @ git+https://github.com/OCA/queue.git@refs/pull/840/head#subdirectory=test_queue_job From 420d6a59864cf9698bee5db7b5a03d0c6470aae7 Mon Sep 17 00:00:00 2001 From: Milan Topuzov Date: Wed, 1 Oct 2025 19:38:03 +0200 Subject: [PATCH 3/6] [pre-commit] auto-fixes for queue_job_batch scope --- .pre-commit-config.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3d0fa1036b..eee2331676 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,12 +3,10 @@ exclude: | # NOT INSTALLABLE ADDONS ^base_import_async/| ^queue_job/| - ^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$| From 00d4ad129134cbb58241a5ee95f10f4cddae81c3 Mon Sep 17 00:00:00 2001 From: Milan Topuzov Date: Wed, 1 Oct 2025 21:37:09 +0200 Subject: [PATCH 4/6] pre-commit: apply autofixes (drop requirements.txt, format XML, sort imports) - Delete root requirements.txt (no external deps across selected addons)\n- Prettier reformat queue_job_batch search view\n- Sort imports in QueueJobBatchMenu.esm.js per eslint\n\nNon-functional changes only --- .../src/components/QueueJobBatchMenu.esm.js | 10 +++++----- queue_job_batch/views/queue_job_batch_views.xml | 16 ++++++++++++---- requirements.txt | 2 -- 3 files changed, 17 insertions(+), 11 deletions(-) delete mode 100644 requirements.txt diff --git a/queue_job_batch/static/src/components/QueueJobBatchMenu.esm.js b/queue_job_batch/static/src/components/QueueJobBatchMenu.esm.js index a8addd461b..8b7d18aa33 100644 --- a/queue_job_batch/static/src/components/QueueJobBatchMenu.esm.js +++ b/queue_job_batch/static/src/components/QueueJobBatchMenu.esm.js @@ -3,15 +3,15 @@ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */ +import {useDiscussSystray} from "@mail/utils/common/hooks"; import {Component, useState} from "@odoo/owl"; -import {ColumnProgress} from "@web/views/view_components/column_progress"; import {Dropdown} from "@web/core/dropdown/dropdown"; -import {registry} from "@web/core/registry"; -import {useDiscussSystray} from "@mail/utils/common/hooks"; import {useDropdownState} from "@web/core/dropdown/dropdown_hooks"; -import {useService} from "@web/core/utils/hooks"; -import {user} from "@web/core/user"; import {_t} from "@web/core/l10n/translation"; +import {registry} from "@web/core/registry"; +import {user} from "@web/core/user"; +import {useService} from "@web/core/utils/hooks"; +import {ColumnProgress} from "@web/views/view_components/column_progress"; export class QueueJobBatchMenu extends Component { static template = "queue_job_batch.QueueJobBatchMenu"; diff --git a/queue_job_batch/views/queue_job_batch_views.xml b/queue_job_batch/views/queue_job_batch_views.xml index b3a5cdc510..a946ee6fa2 100644 --- a/queue_job_batch/views/queue_job_batch_views.xml +++ b/queue_job_batch/views/queue_job_batch_views.xml @@ -65,7 +65,7 @@ - + - + - - + + diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index b4d39fb9e0..0000000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -# generated from manifests external_dependencies -requests From c509e8c120a56d6a0008b5840b8bb247e618a186 Mon Sep 17 00:00:00 2001 From: Milan Topuzov Date: Wed, 1 Oct 2025 23:55:37 +0200 Subject: [PATCH 5/6] migrations: move to 19.0.1.0.0 (pre-migrate.py) --- .../migrations/{18.0.1.0.0 => 19.0.1.0.0}/pre-migrate.py | 1 + 1 file changed, 1 insertion(+) rename queue_job_batch/migrations/{18.0.1.0.0 => 19.0.1.0.0}/pre-migrate.py (99%) diff --git a/queue_job_batch/migrations/18.0.1.0.0/pre-migrate.py b/queue_job_batch/migrations/19.0.1.0.0/pre-migrate.py similarity index 99% rename from queue_job_batch/migrations/18.0.1.0.0/pre-migrate.py rename to queue_job_batch/migrations/19.0.1.0.0/pre-migrate.py index 6d5f4e08af..2cf4877807 100644 --- a/queue_job_batch/migrations/18.0.1.0.0/pre-migrate.py +++ b/queue_job_batch/migrations/19.0.1.0.0/pre-migrate.py @@ -17,3 +17,4 @@ def migrate(cr, version): WHERE state != 'finished' AND is_read """ ) + From 04b95b262f6b07707b44b193daa30da18e9d1bcb Mon Sep 17 00:00:00 2001 From: Milan Topuzov Date: Wed, 1 Oct 2025 23:58:16 +0200 Subject: [PATCH 6/6] pre-commit: fix EOF in migration script --- queue_job_batch/migrations/19.0.1.0.0/pre-migrate.py | 1 - 1 file changed, 1 deletion(-) diff --git a/queue_job_batch/migrations/19.0.1.0.0/pre-migrate.py b/queue_job_batch/migrations/19.0.1.0.0/pre-migrate.py index 2cf4877807..6d5f4e08af 100644 --- a/queue_job_batch/migrations/19.0.1.0.0/pre-migrate.py +++ b/queue_job_batch/migrations/19.0.1.0.0/pre-migrate.py @@ -17,4 +17,3 @@ def migrate(cr, version): WHERE state != 'finished' AND is_read """ ) -