[14.0][MIG] queue_job_batch, test_queue_job_batch: Migration to 14.0

queue_job_batch/README.rst

@@ -14,16 +14,16 @@ Job Queue Batch
     :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/12.0/queue_job_batch
+    :target: https://github.com/OCA/queue/tree/14.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-12-0/queue-12-0-queue_job_batch
+    :target: https://translation.odoo-community.org/projects/queue-14-0/queue-14-0-queue_job_batch
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/230/12.0
+    :target: https://runbot.odoo-community.org/runbot/230/14.0
     :alt: Try me on Runbot
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 This addon adds an a grouper for queue jobs.
 
@@ -35,21 +35,17 @@ Example:
 .. code-block:: python
 
   from odoo import models, fields, api
-  from odoo.addons.queue_job.job import job
 
   class MyModel(models.Model):
      _name = 'my.model'
 
-     @api.multi
-     @job
      def my_method(self, a, k=None):
          _logger.info('executed with a: %s and k: %s', a, k)
 
 
   class MyOtherModel(models.Model):
       _name = 'my.other.model'
 
-      @api.multi
       def button_do_stuff(self):
           batch = self.env['queue.job.batch'].get_new_batch('Group')
           for i in range(1, 100):
@@ -83,7 +79,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 smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/queue/issues/new?body=module:%20queue_job_batch%0Aversion:%2012.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_batch%0Aversion:%2014.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.
 
@@ -100,6 +96,13 @@ Contributors
 
 * Enric Tobella <etobella@creublanca.es>
 * Lois Rilo <lois.rilo@eficent.com>
+* `Trobz <https://trobz.com>`_:
+    * Hoang Diep <hoang@trobz.com>
+
+Other credits
+~~~~~~~~~~~~~
+
+The migration of this module from 12.0 to 14.0 was financially supported by Camptocamp
 
 Maintainers
 ~~~~~~~~~~~
@@ -114,6 +117,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 <https://github.com/OCA/queue/tree/12.0/queue_job_batch>`_ project on GitHub.
+This module is part of the `OCA/queue <https://github.com/OCA/queue/tree/14.0/queue_job_batch>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

queue_job_batch/__manifest__.py

@@ -5,7 +5,7 @@
 
 {
     "name": "Job Queue Batch",
-    "version": "12.0.1.0.1",
+    "version": "14.0.1.0.0",
     "author": "Creu Blanca,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/queue",
     "license": "AGPL-3",
@@ -17,8 +17,13 @@
         "static/src/xml/systray.xml",
     ],
     "data": [
+        # data
+        "data/queue_job_channel_data.xml",
+        "data/queue_job_function_data.xml",
+        # security
         "security/security.xml",
         "security/ir.model.access.csv",
+        # views
         "views/queue_job_views.xml",
         "views/queue_job_batch_views.xml",
         "views/assets_backend.xml",

queue_job_batch/data/queue_job_channel_data.xml

@@ -0,0 +1,6 @@
+<odoo noupdate="1">
+    <record model="queue.job.channel" id="channel_queue_job_batch">
+        <field name="name">queue.job.batch</field>
+        <field name="parent_id" ref="queue_job.channel_root" />
+    </record>
+</odoo>

queue_job_batch/data/queue_job_function_data.xml

@@ -0,0 +1,7 @@
+<odoo noupdate="1">
+    <record id="job_function_queue_job_check_state" model="queue.job.function">
+        <field name="model_id" ref="queue_job_batch.model_queue_job_batch" />
+        <field name="channel_id" ref="queue_job_batch.channel_queue_job_batch" />
+        <field name="method">check_state</field>
+    </record>
+</odoo>

queue_job_batch/models/queue_job.py

@@ -16,7 +16,6 @@ def create(self, vals):
             vals.update({"job_batch_id": batch.id})
         return super().create(vals)
 
-    @api.multi
     def write(self, vals):
         batches = self.env["queue.job.batch"]
         for record in self:

queue_job_batch/models/queue_job_batch.py

@@ -5,8 +5,6 @@
 
 from odoo import api, fields, models
 
-from odoo.addons.queue_job.job import job
-
 
 class QueueJobBatch(models.Model):
     _name = "queue.job.batch"
@@ -17,7 +15,7 @@ class QueueJobBatch(models.Model):
     name = fields.Char(
         required=True,
         readonly=True,
-        track_visibility="onchange",
+        tracking=True,
     )
     job_ids = fields.One2many(
         "queue.job",
@@ -31,7 +29,7 @@ class QueueJobBatch(models.Model):
         "res.users",
         required=True,
         readonly=True,
-        track_visibility="onchange",
+        tracking=True,
     )
     state = fields.Selection(
         [
@@ -43,7 +41,7 @@ class QueueJobBatch(models.Model):
         default="draft",
         required=True,
         readonly=True,
-        track_visibility="onchange",
+        tracking=True,
     )
     finished_job_count = fields.Float(
         compute="_compute_job_count",
@@ -68,7 +66,6 @@ def enqueue(self):
         for record in self:
             record.check_state()
 
-    @job
     def check_state(self):
         self.ensure_one()
         if self.state == "enqueued" and any(
@@ -86,7 +83,6 @@ def check_state(self):
             )
         return True
 
-    @api.multi
     def set_read(self):
         res = self.write({"is_read": True})
         notifications = []
@@ -98,14 +94,11 @@ def set_read(self):
     @api.model
     def get_new_batch(self, name, **kwargs):
         vals = kwargs.copy()
+        company_id = self.env.user.company_id.id
+
         if "company_id" in self.env.context:
             company_id = self.env.context["company_id"]
-        else:
-            company_model = self.env["res.company"]
-            company_model = company_model.sudo(self.env.uid)
-            company_id = company_model._company_default_get(
-                object="queue.job", field="company_id"
-            ).id
+
         vals.update(
             {
                 "user_id": self.env.uid,
@@ -114,7 +107,7 @@ def get_new_batch(self, name, **kwargs):
                 "company_id": company_id,
             }
         )
-        return self.sudo().create(vals).sudo(self.env.uid)
+        return self.sudo().create(vals).with_user(self.env.uid)
 
     @api.depends("job_ids")
     def _compute_job_count(self):

queue_job_batch/readme/CONTRIBUTORS.rst

@@ -1,2 +1,4 @@
 * Enric Tobella <etobella@creublanca.es>
 * Lois Rilo <lois.rilo@eficent.com>
+* `Trobz <https://trobz.com>`_:
+    * Hoang Diep <hoang@trobz.com>

queue_job_batch/readme/CREDITS.rst

@@ -0,0 +1 @@
+The migration of this module from 12.0 to 14.0 was financially supported by Camptocamp

queue_job_batch/static/description/index.html

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>Job Queue Batch</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Job Queue Batch</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/queue/tree/12.0/queue_job_batch"><img alt="OCA/queue" src="https://img.shields.io/badge/github-OCA%2Fqueue-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/queue-12-0/queue-12-0-queue_job_batch"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/230/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/queue/tree/14.0/queue_job_batch"><img alt="OCA/queue" src="https://img.shields.io/badge/github-OCA%2Fqueue-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/queue-14-0/queue-14-0-queue_job_batch"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/230/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This addon adds an a grouper for queue jobs.</p>
 <p>It allows to show your jobs in a batched form in order to know better the
 results.</p>
@@ -410,7 +410,8 @@ <h1 class="title">Job Queue Batch</h1>
 <li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
 <li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
 <li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
+<li><a class="reference internal" href="#other-credits" id="id6">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
 </ul>
 </li>
 </ul>
@@ -425,7 +426,7 @@ <h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
 <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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/queue/issues/new?body=module:%20queue_job_batch%0Aversion:%2012.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_batch%0Aversion:%2014.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">
@@ -441,16 +442,28 @@ <h2><a class="toc-backref" href="#id5">Contributors</a></h2>
 <ul class="simple">
 <li>Enric Tobella &lt;<a class="reference external" href="mailto:etobella&#64;creublanca.es">etobella&#64;creublanca.es</a>&gt;</li>
 <li>Lois Rilo &lt;<a class="reference external" href="mailto:lois.rilo&#64;eficent.com">lois.rilo&#64;eficent.com</a>&gt;</li>
+<li><dl class="first docutils">
+<dt><a class="reference external" href="https://trobz.com">Trobz</a>:</dt>
+<dd><ul class="first last">
+<li>Hoang Diep &lt;<a class="reference external" href="mailto:hoang&#64;trobz.com">hoang&#64;trobz.com</a>&gt;</li>
 </ul>
+</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#id6">Other credits</a></h2>
+<p>The migration of this module from 12.0 to 14.0 was financially supported by Camptocamp</p>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#id7">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>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.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/queue/tree/12.0/queue_job_batch">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/14.0/queue_job_batch">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>

queue_job_batch/static/src/js/systray.js

@@ -5,7 +5,7 @@ odoo.define("queue_job_batch.systray", function (require) {
     var session = require("web.session");
     var SystrayMenu = require("web.SystrayMenu");
     var Widget = require("web.Widget");
-    var BusService = require("bus.BusService");
+    require("bus.BusService");
 
     var QWeb = core.qweb;
 

queue_job_batch/views/queue_job_batch_views.xml

@@ -106,7 +106,6 @@
     <record id="action_queue_job_batch" model="ir.actions.act_window">
         <field name="name">Job batches</field>
         <field name="res_model">queue.job.batch</field>
-        <field name="view_type">form</field>
         <field name="context">{'search_default_draft': 1,
                                'search_default_progress': 1,}</field>
         <field name="view_mode">tree,form</field>
@@ -115,7 +114,6 @@
     <record id="action_view_your_queue_job_batch" model="ir.actions.act_window">
         <field name="name">Job batches</field>
         <field name="res_model">queue.job.batch</field>
-        <field name="view_type">form</field>
         <field
             name="domain"
         >[('user_id', '=', uid), '|', ('state', 'in', ['draft', 'progress']), ('is_read', '=', False)]</field>

queue_job_batch/views/queue_job_views.xml

@@ -30,7 +30,6 @@
     <record id="action_queue_job_related" model="ir.actions.act_window">
         <field name="name">Jobs</field>
         <field name="res_model">queue.job</field>
-        <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('job_batch_id', '=', active_id)]</field>
         <field name="view_id" ref="queue_job.view_queue_job_tree" />