diff --git a/account_asset_batch_compute/README.rst b/account_asset_batch_compute/README.rst
index fa64141b..0fa7bc52 100644
--- a/account_asset_batch_compute/README.rst
+++ b/account_asset_batch_compute/README.rst
@@ -14,13 +14,13 @@ Account Asset Batch Compute
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--financial--tools-lightgray.png?logo=github
- :target: https://github.com/OCA/account-financial-tools/tree/12.0/account_asset_batch_compute
+ :target: https://github.com/OCA/account-financial-tools/tree/13.0/account_asset_batch_compute
:alt: OCA/account-financial-tools
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
- :target: https://translation.odoo-community.org/projects/account-financial-tools-12-0/account-financial-tools-12-0-account_asset_batch_compute
+ :target: https://translation.odoo-community.org/projects/account-financial-tools-13-0/account-financial-tools-13-0-account_asset_batch_compute
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
- :target: https://runbot.odoo-community.org/runbot/92/12.0
+ :target: https://runbot.odoo-community.org/runbot/92/13.0
:alt: Try me on Runbot
|badge1| |badge2| |badge3| |badge4| |badge5|
@@ -29,7 +29,6 @@ Add the possibility to compute assets in batch.
This module adds a flag on compute assets wizard in order to execute
this process in batch.
-
**Table of contents**
.. contents::
@@ -41,7 +40,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 smashing it by providing a detailed and welcomed
-`feedback `_.
+`feedback `_.
Do not contact contributors directly about support or help with technical issues.
@@ -52,13 +51,14 @@ Authors
~~~~~~~
* ACSONE SA/NV
-* Eficent
+* ForgeFlow
Contributors
~~~~~~~~~~~~
* Adrien Peiffer
-* Jordi Ballester Alomar
+* Jordi Ballester Alomar
+* Alba Riera
Maintainers
~~~~~~~~~~~
@@ -73,6 +73,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/account-financial-tools `_ project on GitHub.
+This module is part of the `OCA/account-financial-tools `_ project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/account_asset_batch_compute/__manifest__.py b/account_asset_batch_compute/__manifest__.py
index 1b941025..6138dad2 100644
--- a/account_asset_batch_compute/__manifest__.py
+++ b/account_asset_batch_compute/__manifest__.py
@@ -5,10 +5,10 @@
"name": "Account Asset Batch Compute",
"summary": """
Add the possibility to compute assets in batch""",
- "version": "12.0.1.0.0",
+ "version": "13.0.1.0.0",
"license": "AGPL-3",
- "author": "ACSONE SA/NV," "Eficent," "Odoo Community Association (OCA)",
+ "author": "ACSONE SA/NV,ForgeFlow,Odoo Community Association (OCA)",
"website": "https://github.com/OCA/account-financial-tools",
- "depends": ["account_asset_management", "queue_job",],
- "data": ["wizards/account_asset_compute_views.xml",],
+ "depends": ["account_asset_management", "queue_job"],
+ "data": ["wizards/account_asset_compute_views.xml", "data/queue_data.xml"],
}
diff --git a/account_asset_batch_compute/data/queue_data.xml b/account_asset_batch_compute/data/queue_data.xml
new file mode 100644
index 00000000..ebb5ca8c
--- /dev/null
+++ b/account_asset_batch_compute/data/queue_data.xml
@@ -0,0 +1,23 @@
+
+
+
+ account_asset_batch_compute
+
+
+
+
+ _compute_entries
+
+
+
+
+ asset_compute
+
+
+
diff --git a/account_asset_batch_compute/i18n/account_asset_batch_compute.pot b/account_asset_batch_compute/i18n/account_asset_batch_compute.pot
index b146524b..54bad2d2 100644
--- a/account_asset_batch_compute/i18n/account_asset_batch_compute.pot
+++ b/account_asset_batch_compute/i18n/account_asset_batch_compute.pot
@@ -1,12 +1,12 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
-# * account_asset_batch_compute
+# * account_asset_batch_compute
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 13.0\n"
"Report-Msgid-Bugs-To: \n"
-"Last-Translator: <>\n"
+"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,14 +29,13 @@ msgid "Compute Assets"
msgstr ""
#. module: account_asset_batch_compute
-#: code:addons/account_asset_batch_compute/wizards/account_asset_compute.py:31
+#: code:addons/account_asset_batch_compute/wizards/account_asset_compute.py:0
#, python-format
msgid "Creating jobs to create moves for assets to %s"
msgstr ""
#. module: account_asset_batch_compute
-#: code:addons/account_asset_batch_compute/models/account_asset.py:29
+#: code:addons/account_asset_batch_compute/models/account_asset.py:0
#, python-format
msgid "Creating move for asset with id %s to %s"
msgstr ""
-
diff --git a/account_asset_batch_compute/models/account_asset.py b/account_asset_batch_compute/models/account_asset.py
index 4112dcba..761c7f58 100644
--- a/account_asset_batch_compute/models/account_asset.py
+++ b/account_asset_batch_compute/models/account_asset.py
@@ -1,24 +1,13 @@
# Copyright 2016 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-import logging
-
-from odoo import _, api, models
-
-_logger = logging.getLogger(__name__)
-
-try:
- from odoo.addons.queue_job.job import job
-except ImportError:
- _logger.debug("Can not `import queue_job`.")
+from odoo import _, models
class AccountAsset(models.Model):
_inherit = "account.asset"
- @api.multi
- @job(default_channel="root.account_asset_batch_compute")
def _compute_entries(self, date_end, check_triggers=False):
if self.env.context.get(
"asset_batch_processing", False
diff --git a/account_asset_batch_compute/readme/CONTRIBUTORS.rst b/account_asset_batch_compute/readme/CONTRIBUTORS.rst
index 615367e6..13321599 100644
--- a/account_asset_batch_compute/readme/CONTRIBUTORS.rst
+++ b/account_asset_batch_compute/readme/CONTRIBUTORS.rst
@@ -1,2 +1,3 @@
* Adrien Peiffer
-* Jordi Ballester Alomar
+* Jordi Ballester Alomar
+* Alba Riera
diff --git a/account_asset_batch_compute/static/description/index.html b/account_asset_batch_compute/static/description/index.html
index 716ae194..d7e963b4 100644
--- a/account_asset_batch_compute/static/description/index.html
+++ b/account_asset_batch_compute/static/description/index.html
@@ -367,7 +367,7 @@ ul.auto-toc {
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-
+
Add the possibility to compute assets in batch.
This module adds a flag on compute assets wizard in order to execute
this process in batch.
@@ -388,7 +388,7 @@ this process in batch.
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 smashing it by providing a detailed and welcomed
-feedback.
+feedback.
Do not contact contributors directly about support or help with technical issues.
@@ -397,14 +397,15 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
- ACSONE SA/NV
-- Eficent
+- ForgeFlow
@@ -414,7 +415,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
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/account-financial-tools project on GitHub.
+
This module is part of the OCA/account-financial-tools project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/account_asset_batch_compute/tests/test_account_asset_batch_compute.py b/account_asset_batch_compute/tests/test_account_asset_batch_compute.py
index 1ffaa573..c5dee247 100644
--- a/account_asset_batch_compute/tests/test_account_asset_batch_compute.py
+++ b/account_asset_batch_compute/tests/test_account_asset_batch_compute.py
@@ -1,5 +1,5 @@
# Copyright 2016-19 ACSONE SA/NV
-# Copyright 2019 Eficent Business and IT Consulting Services, S.L.
+# Copyright 2019 ForgeFlow S.L.
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
import time
from datetime import date
@@ -19,7 +19,7 @@ class TestAccountAssetBatchCompute(TransactionCase):
self.asset_profile_model = self.env["account.asset.profile"]
self.account_account_type_model = self.env["account.account.type"]
self.account_type_regular = self.account_account_type_model.create(
- {"name": "Test Regular", "type": "other",}
+ {"name": "Test Regular", "type": "other", "internal_group": "liability"}
)
self.account = self.env["account.account"].create(
{
@@ -29,7 +29,7 @@ class TestAccountAssetBatchCompute(TransactionCase):
}
)
self.journal = self.env["account.journal"].create(
- {"name": "Test Journal", "code": "TJ", "type": "general",}
+ {"name": "Test Journal", "code": "TJ", "type": "general"}
)
self.profile = self.asset_profile_model.create(
{
@@ -65,7 +65,7 @@ class TestAccountAssetBatchCompute(TransactionCase):
self.nextmonth = first_day_of_month + relativedelta.relativedelta(months=1)
self.asset01.date_start = first_day_of_month
- def test_1(self):
+ def test_no_batch_processing(self):
wiz = self.wiz_obj.create(
{"batch_processing": False, "date_end": self.nextmonth}
)
@@ -87,7 +87,7 @@ class TestAccountAssetBatchCompute(TransactionCase):
)
self.assertTrue(len(depreciation_line) == 1)
- def test_2(self):
+ def test_batch_processing(self):
wiz = self.wiz_obj.create(
{"batch_processing": True, "date_end": self.nextmonth}
)
@@ -112,6 +112,13 @@ class TestAccountAssetBatchCompute(TransactionCase):
jobs = self.env["queue.job"].search(
[("name", "=", job_name)], order="date_created desc", limit=1
)
+ self.assertEqual(
+ jobs.job_function_id,
+ self.env.ref(
+ "account_asset_batch_compute."
+ "job_function_account_asset_compute_asset_compute"
+ ),
+ )
self.assertTrue(len(jobs) == 1)
job = Job.load(self.env, jobs.uuid)
# perform job
@@ -127,6 +134,12 @@ class TestAccountAssetBatchCompute(TransactionCase):
[("name", "=", job_name)], order="date_created desc", limit=1
)
self.assertTrue(len(jobs) == 1)
+ self.assertEqual(
+ jobs.job_function_id,
+ self.env.ref(
+ "account_asset_batch_compute.job_function_account_asset_compute_entries"
+ ),
+ )
job = Job.load(self.env, jobs.uuid)
job.perform()
depreciation_line = self.asset01.depreciation_line_ids.filtered(
diff --git a/account_asset_batch_compute/wizards/account_asset_compute.py b/account_asset_batch_compute/wizards/account_asset_compute.py
index 86d163a9..2e721f9c 100644
--- a/account_asset_batch_compute/wizards/account_asset_compute.py
+++ b/account_asset_batch_compute/wizards/account_asset_compute.py
@@ -1,16 +1,7 @@
# Copyright 2016-2017 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-import logging
-
-from odoo import _, api, fields, models
-
-_logger = logging.getLogger(__name__)
-
-try:
- from odoo.addons.queue_job.job import job
-except ImportError:
- _logger.debug("Can not `import queue_job`.")
+from odoo import _, fields, models
class AccountAssetCompute(models.TransientModel):
@@ -19,8 +10,6 @@ class AccountAssetCompute(models.TransientModel):
batch_processing = fields.Boolean()
- @api.multi
- @job(default_channel="root.account_asset_batch_compute")
def asset_compute(self):
self.ensure_one()
if not self.batch_processing: