diff --git a/base_cron_exclusion/README.rst b/base_cron_exclusion/README.rst new file mode 100644 index 000000000..e99e5b38e --- /dev/null +++ b/base_cron_exclusion/README.rst @@ -0,0 +1,87 @@ +=================== +Base Cron Exclusion +=================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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 + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--tools-lightgray.png?logo=github + :target: https://github.com/OCA/server-tools/tree/12.0/base_cron_exclusion + :alt: OCA/server-tools +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/server-tools-12-0/server-tools-12-0-base_cron_exclusion + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/149/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module extends the functionality of scheduled actions to allow you to +select the ones that should not run simultaneously. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +To use this module, you need to: + +#. Go to *Settings > Technical > Automation > Scheduled Actions*. +#. In the form view go to the tab *Mutually Exclusive Scheduled Actions*. +#. Fill it with the actions that should be blocked while running the action + you are editing. Note that this is mutual and the selected actions will + block the initial action when running. + +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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Eficent + +Contributors +~~~~~~~~~~~~ + +* Lois Rilo +* Jordi Ballester +* Bhavesh Odedra + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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/server-tools `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/base_cron_exclusion/__init__.py b/base_cron_exclusion/__init__.py new file mode 100644 index 000000000..4b76c7b2d --- /dev/null +++ b/base_cron_exclusion/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from . import models diff --git a/base_cron_exclusion/__manifest__.py b/base_cron_exclusion/__manifest__.py new file mode 100644 index 000000000..5bf8b6532 --- /dev/null +++ b/base_cron_exclusion/__manifest__.py @@ -0,0 +1,21 @@ +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +{ + "name": "Base Cron Exclusion", + "summary": "Allow you to select scheduled actions that should not run " + "simultaneously.", + "version": "12.0.1.0.0", + "author": "Eficent, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/server-tools", + "category": "Tools", + "depends": [ + "base", + ], + "data": [ + "views/ir_cron_view.xml", + ], + "license": "AGPL-3", + "installable": True, +} diff --git a/base_cron_exclusion/i18n/base_cron_exclusion.pot b/base_cron_exclusion/i18n/base_cron_exclusion.pot new file mode 100644 index 000000000..b165d4b01 --- /dev/null +++ b/base_cron_exclusion/i18n/base_cron_exclusion.pot @@ -0,0 +1,32 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_cron_exclusion +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: base_cron_exclusion +#: model:ir.model.fields,field_description:base_cron_exclusion.field_ir_cron__mutually_exclusive_cron_ids +#: model_terms:ir.ui.view,arch_db:base_cron_exclusion.ir_cron_view_form +msgid "Mutually Exclusive Scheduled Actions" +msgstr "" + +#. module: base_cron_exclusion +#: model:ir.model,name:base_cron_exclusion.model_ir_cron +msgid "Scheduled Actions" +msgstr "" + +#. module: base_cron_exclusion +#: code:addons/base_cron_exclusion/models/ir_cron.py:21 +#, python-format +msgid "You can not mutually exclude a scheduled actions with itself." +msgstr "" + diff --git a/base_cron_exclusion/i18n/cs_CZ.po b/base_cron_exclusion/i18n/cs_CZ.po new file mode 100644 index 000000000..1debe736d --- /dev/null +++ b/base_cron_exclusion/i18n/cs_CZ.po @@ -0,0 +1,37 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_cron_exclusion +# +# Translators: +# Lukáš Spurný , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-03-03 10:08+0000\n" +"PO-Revision-Date: 2018-03-03 10:08+0000\n" +"Last-Translator: Lukáš Spurný , 2018\n" +"Language-Team: Czech (Czech Republic) (https://www.transifex.com/oca/" +"teams/23907/cs_CZ/)\n" +"Language: cs_CZ\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#. module: base_cron_exclusion +#: model:ir.model.fields,field_description:base_cron_exclusion.field_ir_cron_mutually_exclusive_cron_ids +#: model:ir.ui.view,arch_db:base_cron_exclusion.ir_cron_view +msgid "Mutually Exclusive Scheduled Actions" +msgstr "Vzájemně výlučné plánované akce" + +#. module: base_cron_exclusion +#: model:ir.model,name:base_cron_exclusion.model_ir_cron +msgid "Scheduled Actions" +msgstr "Plánované akce" + +#. module: base_cron_exclusion +#: code:addons/base_cron_exclusion/models/ir_cron.py:21 +#, python-format +msgid "You can not mutually exclude a scheduled actions with itself." +msgstr "Nemůžete vzájemně vylučují naplánovaná akce se sebou samým." diff --git a/base_cron_exclusion/i18n/es.po b/base_cron_exclusion/i18n/es.po new file mode 100644 index 000000000..a4f213643 --- /dev/null +++ b/base_cron_exclusion/i18n/es.po @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_cron_exclusion +# +# Translators: +# enjolras , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-03-03 10:08+0000\n" +"PO-Revision-Date: 2018-03-03 10:08+0000\n" +"Last-Translator: enjolras , 2018\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: base_cron_exclusion +#: model:ir.model.fields,field_description:base_cron_exclusion.field_ir_cron_mutually_exclusive_cron_ids +#: model:ir.ui.view,arch_db:base_cron_exclusion.ir_cron_view +msgid "Mutually Exclusive Scheduled Actions" +msgstr "Acciones programadas excluyentes mutuamente" + +#. module: base_cron_exclusion +#: model:ir.model,name:base_cron_exclusion.model_ir_cron +msgid "Scheduled Actions" +msgstr "Acciones programadas" + +#. module: base_cron_exclusion +#: code:addons/base_cron_exclusion/models/ir_cron.py:21 +#, python-format +msgid "You can not mutually exclude a scheduled actions with itself." +msgstr "No puede excluir mutuamente una acción con ella misma." diff --git a/base_cron_exclusion/i18n/fr.po b/base_cron_exclusion/i18n/fr.po new file mode 100644 index 000000000..4c6a3ebb0 --- /dev/null +++ b/base_cron_exclusion/i18n/fr.po @@ -0,0 +1,37 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_cron_exclusion +# +# Translators: +# Quentin THEURET , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-03-03 10:08+0000\n" +"PO-Revision-Date: 2018-03-03 10:08+0000\n" +"Last-Translator: Quentin THEURET , 2018\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: base_cron_exclusion +#: model:ir.model.fields,field_description:base_cron_exclusion.field_ir_cron_mutually_exclusive_cron_ids +#: model:ir.ui.view,arch_db:base_cron_exclusion.ir_cron_view +msgid "Mutually Exclusive Scheduled Actions" +msgstr "Actions planifiées mutuellement exclusives" + +#. module: base_cron_exclusion +#: model:ir.model,name:base_cron_exclusion.model_ir_cron +msgid "Scheduled Actions" +msgstr "Actions planifiées" + +#. module: base_cron_exclusion +#: code:addons/base_cron_exclusion/models/ir_cron.py:21 +#, python-format +msgid "You can not mutually exclude a scheduled actions with itself." +msgstr "" +"Vous ne pouvez pas exclure mutuellement une action planifiée avec elle-même." diff --git a/base_cron_exclusion/models/__init__.py b/base_cron_exclusion/models/__init__.py new file mode 100644 index 000000000..0ab813f47 --- /dev/null +++ b/base_cron_exclusion/models/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from . import ir_cron diff --git a/base_cron_exclusion/models/ir_cron.py b/base_cron_exclusion/models/ir_cron.py new file mode 100644 index 000000000..499b774ac --- /dev/null +++ b/base_cron_exclusion/models/ir_cron.py @@ -0,0 +1,62 @@ +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +import logging + +from odoo import sql_db +from odoo import api, fields, models, _ +from odoo.exceptions import ValidationError + +_logger = logging.getLogger(__name__) + + +class IrCron(models.Model): + _inherit = "ir.cron" + + @api.constrains('mutually_exclusive_cron_ids') + def _check_auto_exclusion(self): + for item in self: + if item in item.mutually_exclusive_cron_ids: + raise ValidationError(_( + "You can not mutually exclude a scheduled actions with " + "itself.")) + + mutually_exclusive_cron_ids = fields.Many2many( + comodel_name="ir.cron", relation="ir_cron_exclusion", + column1="ir_cron1_id", column2="ir_cron2_id", + string="Mutually Exclusive Scheduled Actions") + + @staticmethod + def _lock_mutually_exclusive_cron(db, job_id): + lock_cr = db.cursor() + lock_cr.execute(""" + WITH Q1 AS (SELECT ir_cron2_id as cron_id FROM ir_cron_exclusion + WHERE ir_cron1_id=%s + UNION ALL + SELECT ir_cron1_id as cron_id FROM ir_cron_exclusion + WHERE ir_cron2_id=%s) + SELECT * FROM Q1 + GROUP BY cron_id;""", (job_id, job_id)) + locked_ids = tuple([row[0] for row in lock_cr.fetchall()]) + if locked_ids: + lock_cr.execute("""SELECT * + FROM ir_cron + WHERE numbercall != 0 + AND active + AND id IN %s + FOR UPDATE NOWAIT""", + (locked_ids,), log_exceptions=False) + lock_cr.fetchall() + return lock_cr + + @classmethod + def _process_job(cls, job_cr, job, cron_cr): + db = sql_db.db_connect(cls.pool._db.dbname) + locked_crons = cls._lock_mutually_exclusive_cron(db, job['id']) + try: + res = super(IrCron, cls)._process_job(job_cr, job, cron_cr) + finally: + locked_crons.close() + _logger.debug("released blocks for cron job %s" % job['cron_name']) + return res diff --git a/base_cron_exclusion/readme/CONTRIBUTORS.rst b/base_cron_exclusion/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..fdd354aab --- /dev/null +++ b/base_cron_exclusion/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* Lois Rilo +* Jordi Ballester +* Bhavesh Odedra diff --git a/base_cron_exclusion/readme/DESCRIPTION.rst b/base_cron_exclusion/readme/DESCRIPTION.rst new file mode 100644 index 000000000..3dd9ca480 --- /dev/null +++ b/base_cron_exclusion/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module extends the functionality of scheduled actions to allow you to +select the ones that should not run simultaneously. diff --git a/base_cron_exclusion/readme/USAGE.rst b/base_cron_exclusion/readme/USAGE.rst new file mode 100644 index 000000000..782e14e60 --- /dev/null +++ b/base_cron_exclusion/readme/USAGE.rst @@ -0,0 +1,7 @@ +To use this module, you need to: + +#. Go to *Settings > Technical > Automation > Scheduled Actions*. +#. In the form view go to the tab *Mutually Exclusive Scheduled Actions*. +#. Fill it with the actions that should be blocked while running the action + you are editing. Note that this is mutual and the selected actions will + block the initial action when running. diff --git a/base_cron_exclusion/static/description/icon.png b/base_cron_exclusion/static/description/icon.png new file mode 100644 index 000000000..3a0328b51 Binary files /dev/null and b/base_cron_exclusion/static/description/icon.png differ diff --git a/base_cron_exclusion/static/description/index.html b/base_cron_exclusion/static/description/index.html new file mode 100644 index 000000000..d62ee2e64 --- /dev/null +++ b/base_cron_exclusion/static/description/index.html @@ -0,0 +1,434 @@ + + + + + + +Base Cron Exclusion + + + +
+

Base Cron Exclusion

+ + +

Beta License: AGPL-3 OCA/server-tools Translate me on Weblate Try me on Runbot

+

This module extends the functionality of scheduled actions to allow you to +select the ones that should not run simultaneously.

+

Table of contents

+ +
+

Usage

+

To use this module, you need to:

+
    +
  1. Go to Settings > Technical > Automation > Scheduled Actions.
    2. +
  2. In the form view go to the tab Mutually Exclusive Scheduled Actions.
    3. +
  3. Fill it with the actions that should be blocked while running the action +you are editing. Note that this is mutual and the selected actions will +block the initial action when running.
    4. +
+
+
+

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.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Eficent
    • +
+
+ +
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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/server-tools project on GitHub.

+

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

+
+
+
+ + diff --git a/base_cron_exclusion/views/ir_cron_view.xml b/base_cron_exclusion/views/ir_cron_view.xml new file mode 100644 index 000000000..d35584562 --- /dev/null +++ b/base_cron_exclusion/views/ir_cron_view.xml @@ -0,0 +1,19 @@ + + + + + + ir.cron.form - base_cron_exclusion + ir.cron + + + + + + + + + + diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt index a58b5a2f1..c2b926cb9 100644 --- a/setup/_metapackage/VERSION.txt +++ b/setup/_metapackage/VERSION.txt @@ -1 +1 @@ -12.0.20190617.0 \ No newline at end of file +12.0.20190709.0 \ No newline at end of file diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py index 6ee9e3a43..a2f71521f 100644 --- a/setup/_metapackage/setup.py +++ b/setup/_metapackage/setup.py @@ -10,6 +10,7 @@ setuptools.setup( install_requires=[ 'odoo12-addon-auditlog', 'odoo12-addon-auto_backup', + 'odoo12-addon-base_cron_exclusion', 'odoo12-addon-base_exception', 'odoo12-addon-base_fontawesome', 'odoo12-addon-base_jsonify', diff --git a/setup/base_cron_exclusion/odoo/addons/base_cron_exclusion b/setup/base_cron_exclusion/odoo/addons/base_cron_exclusion new file mode 120000 index 000000000..35c550dbb --- /dev/null +++ b/setup/base_cron_exclusion/odoo/addons/base_cron_exclusion @@ -0,0 +1 @@ +../../../../base_cron_exclusion \ No newline at end of file diff --git a/setup/base_cron_exclusion/setup.py b/setup/base_cron_exclusion/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/base_cron_exclusion/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)