From 6a7d9d942e81293718a832f80d5324d4ea203dc2 Mon Sep 17 00:00:00 2001 From: Javier Colmeiro Date: Fri, 18 Nov 2022 12:37:25 +0100 Subject: [PATCH 01/14] [ADD] base_tier_validation_waiting --- base_tier_validation_waiting/README.rst | 79 ++++ base_tier_validation_waiting/__init__.py | 4 + base_tier_validation_waiting/__manifest__.py | 21 + .../models/__init__.py | 6 + .../models/tier_definition.py | 14 + .../models/tier_review.py | 45 ++ .../models/tier_validation.py | 49 ++ .../readme/CONFIGURE.rst | 1 + .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 2 + .../readme/DEVELOP.rst | 0 .../readme/ROADMAP.rst | 0 base_tier_validation_waiting/readme/USAGE.rst | 0 .../security/ir.model.access.csv | 1 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 425 ++++++++++++++++++ .../static/src/xml/tier_review_template.xml | 9 + .../tests/__init__.py | 4 + .../tests/test_tier_validation.py | 101 +++++ .../views/tier_definition_views.xml | 14 + 20 files changed, 776 insertions(+) create mode 100644 base_tier_validation_waiting/README.rst create mode 100644 base_tier_validation_waiting/__init__.py create mode 100644 base_tier_validation_waiting/__manifest__.py create mode 100644 base_tier_validation_waiting/models/__init__.py create mode 100644 base_tier_validation_waiting/models/tier_definition.py create mode 100644 base_tier_validation_waiting/models/tier_review.py create mode 100644 base_tier_validation_waiting/models/tier_validation.py create mode 100644 base_tier_validation_waiting/readme/CONFIGURE.rst create mode 100644 base_tier_validation_waiting/readme/CONTRIBUTORS.rst create mode 100644 base_tier_validation_waiting/readme/DESCRIPTION.rst create mode 100644 base_tier_validation_waiting/readme/DEVELOP.rst create mode 100644 base_tier_validation_waiting/readme/ROADMAP.rst create mode 100644 base_tier_validation_waiting/readme/USAGE.rst create mode 100644 base_tier_validation_waiting/security/ir.model.access.csv create mode 100644 base_tier_validation_waiting/static/description/icon.png create mode 100644 base_tier_validation_waiting/static/description/index.html create mode 100644 base_tier_validation_waiting/static/src/xml/tier_review_template.xml create mode 100644 base_tier_validation_waiting/tests/__init__.py create mode 100644 base_tier_validation_waiting/tests/test_tier_validation.py create mode 100644 base_tier_validation_waiting/views/tier_definition_views.xml diff --git a/base_tier_validation_waiting/README.rst b/base_tier_validation_waiting/README.rst new file mode 100644 index 0000000000..e6ac0ec68b --- /dev/null +++ b/base_tier_validation_waiting/README.rst @@ -0,0 +1,79 @@ +===================================== +Base Tier Validation - Waiting status +===================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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--ux-lightgray.png?logo=github + :target: https://github.com/OCA/server-ux/tree/14.0/base_tier_validation_waiting + :alt: OCA/server-ux +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/server-ux-14-0/server-ux-14-0-base_tier_validation_waiting + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/server-ux&target_branch=14.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module extends base_tier_validation to add an initial **"waiting"** status to tier reviews. +It also auto moves next review to pending status when needed and handles notification if set. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +Set "Notify reviewers on reaching pending" if you want to send a notification when pending status is reached + +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 +~~~~~~~ + +* brain-tec AG + +Contributors +~~~~~~~~~~~~ + +* Javier Colmeiro + +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-ux `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/base_tier_validation_waiting/__init__.py b/base_tier_validation_waiting/__init__.py new file mode 100644 index 0000000000..544c2ce7a7 --- /dev/null +++ b/base_tier_validation_waiting/__init__.py @@ -0,0 +1,4 @@ +# Copyright (c) 2022 brain-tec AG (https://braintec.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import models diff --git a/base_tier_validation_waiting/__manifest__.py b/base_tier_validation_waiting/__manifest__.py new file mode 100644 index 0000000000..e53a526fc6 --- /dev/null +++ b/base_tier_validation_waiting/__manifest__.py @@ -0,0 +1,21 @@ +# Copyright (c) 2022 brain-tec AG (https://braintec.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + "name": "Base Tier Validation - Waiting status", + "summary": "Base Tier Validation Extension to add waiting status", + "category": "Tools", + "version": "14.0.1.0.0", + "author": "brain-tec AG, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/server-ux", + "license": "AGPL-3", + "application": False, + "installable": True, + "depends": [ + "base_tier_validation", + ], + "data": [ + "security/ir.model.access.csv", + "views/tier_definition_views.xml", + ], + "qweb": ["static/src/xml/tier_review_template.xml"], +} diff --git a/base_tier_validation_waiting/models/__init__.py b/base_tier_validation_waiting/models/__init__.py new file mode 100644 index 0000000000..c3ebbbafb2 --- /dev/null +++ b/base_tier_validation_waiting/models/__init__.py @@ -0,0 +1,6 @@ +# Copyright (c) 2022 brain-tec AG (https://braintec.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import tier_definition +from . import tier_review +from . import tier_validation diff --git a/base_tier_validation_waiting/models/tier_definition.py b/base_tier_validation_waiting/models/tier_definition.py new file mode 100644 index 0000000000..46a6c336c0 --- /dev/null +++ b/base_tier_validation_waiting/models/tier_definition.py @@ -0,0 +1,14 @@ +# Copyright (c) 2022 brain-tec AG (https://braintec.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import fields, models + + +class TierDefinition(models.Model): + _inherit = "tier.definition" + + notify_on_pending = fields.Boolean( + string="Notify Reviewers on reaching Pending", + help="If set, all possible reviewers will be notified by email when " + "this definition is triggered.", + ) diff --git a/base_tier_validation_waiting/models/tier_review.py b/base_tier_validation_waiting/models/tier_review.py new file mode 100644 index 0000000000..5c1b5d9d8c --- /dev/null +++ b/base_tier_validation_waiting/models/tier_review.py @@ -0,0 +1,45 @@ +# Copyright (c) 2022 brain-tec AG (https://braintec.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import api, fields, models + + +class TierReview(models.Model): + _inherit = "tier.review" + + status = fields.Selection( + selection_add=[("waiting", "Waiting")], + default="waiting", + ondelete={"waiting": "set default"}, + ) + + def _notify_pending_status(self, review_ids): + """Method to call and reuse abstract notification method""" + resource = self.env[self.model].browse(self.res_id) + resource._notify_review_available(review_ids) + + @api.depends("definition_id.approve_sequence") + def _compute_can_review(self): + """inherit base module to push forward waiting reviews""" + reviews = self.filtered( + lambda rev: rev.status in ["waiting", "pending", "rejected"] + ) + if reviews: + # get minimum sequence of all to prevent jumps + next_seq = min(reviews.mapped("sequence")) + for record in reviews: + # if not in waiting, nothing to do + if record.status != "waiting": + continue + # if approve by sequence, check sequence has been reached + if record.approve_sequence: + if record.sequence == next_seq: + record.status = "pending" + # else, move forward any waiting review + else: + record.status = "pending" + # notify if state has changed + if record.status == "pending": + if record.definition_id.notify_on_pending: + record._notify_pending_status(record) + return super(TierReview, self)._compute_can_review() diff --git a/base_tier_validation_waiting/models/tier_validation.py b/base_tier_validation_waiting/models/tier_validation.py new file mode 100644 index 0000000000..ed32ae0d0e --- /dev/null +++ b/base_tier_validation_waiting/models/tier_validation.py @@ -0,0 +1,49 @@ +# Copyright (c) 2022 brain-tec AG (https://braintec.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import fields, models + + +class TierValidation(models.AbstractModel): + _inherit = "tier.validation" + + def _notify_review_available(self, tier_reviews): + """method to notify when reaching pending""" + subscribe = "message_subscribe" + post = "message_post" + if hasattr(self, post) and hasattr(self, subscribe): + for rec in self: + users_to_notify = tier_reviews.filtered( + lambda r: r.definition_id.notify_on_pending and r.res_id == rec.id + ).mapped("reviewer_ids") + # Subscribe reviewers and notify + getattr(rec.sudo(), subscribe)( + partner_ids=users_to_notify.mapped("partner_id").ids + ) + getattr(rec.sudo(), post)( + subtype_xmlid=self._get_requested_notification_subtype(), + body=rec._notify_requested_review_body(), + ) + + def _validate_tier(self, tiers=False): + """extend base tier validation method to allow bypass of waiting + sequences as pending state is hardcoded""" + self.ensure_one() + super(TierValidation, self)._validate_tier(tiers) + tier_reviews = tiers or self.review_ids + waiting_reviews = tier_reviews.filtered( + lambda r: r.status == "waiting" + and (self.env.user in r.reviewer_ids) + and r.approve_sequence_bypass + ) + if waiting_reviews: + waiting_reviews.write( + { + "status": "approved", + "done_by": self.env.user.id, + "reviewed_date": fields.Datetime.now(), + } + ) + for review in waiting_reviews: + rec = self.env[review.model].browse(review.res_id) + rec._notify_accepted_reviews() diff --git a/base_tier_validation_waiting/readme/CONFIGURE.rst b/base_tier_validation_waiting/readme/CONFIGURE.rst new file mode 100644 index 0000000000..c0675cc31c --- /dev/null +++ b/base_tier_validation_waiting/readme/CONFIGURE.rst @@ -0,0 +1 @@ +Set "Notify reviewers on reaching pending" if you want to send a notification when pending status is reached diff --git a/base_tier_validation_waiting/readme/CONTRIBUTORS.rst b/base_tier_validation_waiting/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..98e747f68b --- /dev/null +++ b/base_tier_validation_waiting/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Javier Colmeiro diff --git a/base_tier_validation_waiting/readme/DESCRIPTION.rst b/base_tier_validation_waiting/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..210283a887 --- /dev/null +++ b/base_tier_validation_waiting/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module extends base_tier_validation to add an initial **"waiting"** status to tier reviews. +It also auto moves next review to pending status when needed and handles notification if set. diff --git a/base_tier_validation_waiting/readme/DEVELOP.rst b/base_tier_validation_waiting/readme/DEVELOP.rst new file mode 100644 index 0000000000..e69de29bb2 diff --git a/base_tier_validation_waiting/readme/ROADMAP.rst b/base_tier_validation_waiting/readme/ROADMAP.rst new file mode 100644 index 0000000000..e69de29bb2 diff --git a/base_tier_validation_waiting/readme/USAGE.rst b/base_tier_validation_waiting/readme/USAGE.rst new file mode 100644 index 0000000000..e69de29bb2 diff --git a/base_tier_validation_waiting/security/ir.model.access.csv b/base_tier_validation_waiting/security/ir.model.access.csv new file mode 100644 index 0000000000..97dd8b917b --- /dev/null +++ b/base_tier_validation_waiting/security/ir.model.access.csv @@ -0,0 +1 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink diff --git a/base_tier_validation_waiting/static/description/icon.png b/base_tier_validation_waiting/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/base_tier_validation_waiting/static/description/index.html b/base_tier_validation_waiting/static/description/index.html new file mode 100644 index 0000000000..e11b3b5c54 --- /dev/null +++ b/base_tier_validation_waiting/static/description/index.html @@ -0,0 +1,425 @@ + + + + + + +Base Tier Validation - Waiting status + + + +
+

Base Tier Validation - Waiting status

+ + +

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

+

This module extends base_tier_validation to add an initial “waiting” status to tier reviews. +It also auto moves next review to pending status when needed and handles notification if set.

+

Table of contents

+ +
+

Configuration

+

Set “Notify reviewers on reaching pending” if you want to send a notification when pending status is reached

+
+
+

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

+
    +
  • brain-tec AG
    • +
+
+
+

Contributors

+ +
+
+

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-ux project on GitHub.

+

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

+
+
+
+ + diff --git a/base_tier_validation_waiting/static/src/xml/tier_review_template.xml b/base_tier_validation_waiting/static/src/xml/tier_review_template.xml new file mode 100644 index 0000000000..bd00974800 --- /dev/null +++ b/base_tier_validation_waiting/static/src/xml/tier_review_template.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/base_tier_validation_waiting/tests/__init__.py b/base_tier_validation_waiting/tests/__init__.py new file mode 100644 index 0000000000..d27a780350 --- /dev/null +++ b/base_tier_validation_waiting/tests/__init__.py @@ -0,0 +1,4 @@ +# Copyright (c) 2022 brain-tec AG (https://braintec.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import test_tier_validation diff --git a/base_tier_validation_waiting/tests/test_tier_validation.py b/base_tier_validation_waiting/tests/test_tier_validation.py new file mode 100644 index 0000000000..ef4c8902e3 --- /dev/null +++ b/base_tier_validation_waiting/tests/test_tier_validation.py @@ -0,0 +1,101 @@ +# Copyright (c) 2022 brain-tec AG (https://braintec.com) +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from odoo_test_helper import FakeModelLoader + +from odoo.tests.common import SavepointCase, tagged + + +@tagged("post_install", "-at_install") +class TierTierValidation(SavepointCase): + @classmethod + def setUpClass(cls): + super(TierTierValidation, cls).setUpClass() + + cls.loader = FakeModelLoader(cls.env, cls.__module__) + cls.loader.backup_registry() + from odoo.addons.base_tier_validation.tests.tier_validation_tester import ( + TierValidationTester, + ) + + cls.loader.update_registry((TierValidationTester,)) + cls.test_model = cls.env[TierValidationTester._name] + + cls.tester_model = cls.env["ir.model"].search( + [("model", "=", "tier.validation.tester")] + ) + + # Access record: + cls.env["ir.model.access"].create( + { + "name": "access.tester", + "model_id": cls.tester_model.id, + "perm_read": 1, + "perm_write": 1, + "perm_create": 1, + "perm_unlink": 1, + } + ) + + # Create users: + group_ids = cls.env.ref("base.group_system").ids + cls.test_user_1 = cls.env["res.users"].create( + {"name": "John", "login": "test1", "groups_id": [(6, 0, group_ids)]} + ) + cls.test_user_2 = cls.env["res.users"].create( + {"name": "Mike", "login": "test2"} + ) + + # Create tier definitions: + cls.tier_def_obj = cls.env["tier.definition"] + cls.tier_def_obj.create( + { + "model_id": cls.tester_model.id, + "review_type": "individual", + "reviewer_id": cls.test_user_1.id, + "definition_domain": "[('test_field', '>', 1.0)]", + "approve_sequence": True, + "sequence": 20, + "name": "Test definition 1 - user 1", + } + ) + cls.tier_def_obj.create( + { + "model_id": cls.tester_model.id, + "review_type": "individual", + "reviewer_id": cls.test_user_2.id, + "definition_domain": "[('test_field', '>', 1.0)]", + "approve_sequence": True, + "sequence": 10, + "name": "Test definition 2 - user 2", + } + ) + + cls.test_record = cls.test_model.create({"test_field": 2.5}) + + @classmethod + def tearDownClass(cls): + cls.loader.restore_registry() + super(TierTierValidation, cls).tearDownClass() + + def test_01_waiting_tier(self): + # Create new test record + tier_review_obj = self.env["tier.review"] + test_record = self.test_model.create({"test_field": 2.5}) + # Request validation + review = test_record.with_user(self.test_user_1.id).request_validation() + self.assertTrue(review) + # both reviews should be waiting when created + review_1 = tier_review_obj.browse(review.ids[0]) + review_2 = tier_review_obj.browse(review.ids[1]) + self.assertTrue(review_1.status == "waiting") + self.assertTrue(review_2.status == "waiting") + # and then normal workflow will follow... + review_1._compute_can_review() + self.assertTrue(review_1.status == "pending") + self.assertTrue(review_2.status == "waiting") + record = test_record.with_user(self.test_user_1.id) + record.invalidate_cache() + record.validate_tier() + self.assertTrue(review_1.status == "approved") + self.assertTrue(review_2.status == "pending") diff --git a/base_tier_validation_waiting/views/tier_definition_views.xml b/base_tier_validation_waiting/views/tier_definition_views.xml new file mode 100644 index 0000000000..2d883d454d --- /dev/null +++ b/base_tier_validation_waiting/views/tier_definition_views.xml @@ -0,0 +1,14 @@ + + + + tier.definition.form + tier.definition + + + + + + + + + From 8c93ee887462734c1faef924ed9a704210f63ec1 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Fri, 17 Feb 2023 13:21:51 +0000 Subject: [PATCH 02/14] [UPD] Update base_tier_validation_waiting.pot --- .../i18n/base_tier_validation_waiting.pot | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 base_tier_validation_waiting/i18n/base_tier_validation_waiting.pot diff --git a/base_tier_validation_waiting/i18n/base_tier_validation_waiting.pot b/base_tier_validation_waiting/i18n/base_tier_validation_waiting.pot new file mode 100644 index 0000000000..d34e8336d5 --- /dev/null +++ b/base_tier_validation_waiting/i18n/base_tier_validation_waiting.pot @@ -0,0 +1,72 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_tier_validation_waiting +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.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_tier_validation_waiting +#: model:ir.model.fields,field_description:base_tier_validation_waiting.field_tier_definition__display_name +#: model:ir.model.fields,field_description:base_tier_validation_waiting.field_tier_review__display_name +#: model:ir.model.fields,field_description:base_tier_validation_waiting.field_tier_validation__display_name +msgid "Display Name" +msgstr "" + +#. module: base_tier_validation_waiting +#: model:ir.model.fields,field_description:base_tier_validation_waiting.field_tier_definition__id +#: model:ir.model.fields,field_description:base_tier_validation_waiting.field_tier_review__id +#: model:ir.model.fields,field_description:base_tier_validation_waiting.field_tier_validation__id +msgid "ID" +msgstr "" + +#. module: base_tier_validation_waiting +#: model:ir.model.fields,help:base_tier_validation_waiting.field_tier_definition__notify_on_pending +msgid "" +"If set, all possible reviewers will be notified by email when this " +"definition is triggered." +msgstr "" + +#. module: base_tier_validation_waiting +#: model:ir.model.fields,field_description:base_tier_validation_waiting.field_tier_definition____last_update +#: model:ir.model.fields,field_description:base_tier_validation_waiting.field_tier_review____last_update +#: model:ir.model.fields,field_description:base_tier_validation_waiting.field_tier_validation____last_update +msgid "Last Modified on" +msgstr "" + +#. module: base_tier_validation_waiting +#: model:ir.model.fields,field_description:base_tier_validation_waiting.field_tier_definition__notify_on_pending +msgid "Notify Reviewers on reaching Pending" +msgstr "" + +#. module: base_tier_validation_waiting +#: model:ir.model.fields,field_description:base_tier_validation_waiting.field_tier_review__status +msgid "Status" +msgstr "" + +#. module: base_tier_validation_waiting +#: model:ir.model,name:base_tier_validation_waiting.model_tier_definition +msgid "Tier Definition" +msgstr "" + +#. module: base_tier_validation_waiting +#: model:ir.model,name:base_tier_validation_waiting.model_tier_review +msgid "Tier Review" +msgstr "" + +#. module: base_tier_validation_waiting +#: model:ir.model,name:base_tier_validation_waiting.model_tier_validation +msgid "Tier Validation (abstract)" +msgstr "" + +#. module: base_tier_validation_waiting +#: model:ir.model.fields.selection,name:base_tier_validation_waiting.selection__tier_review__status__waiting +msgid "Waiting" +msgstr "" From a890d1362f257774000a7a300c7b17acfb220719 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 17 Feb 2023 13:26:42 +0000 Subject: [PATCH 03/14] [UPD] README.rst --- base_tier_validation_waiting/README.rst | 6 +++--- base_tier_validation_waiting/static/description/index.html | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base_tier_validation_waiting/README.rst b/base_tier_validation_waiting/README.rst index e6ac0ec68b..329aa8c9c5 100644 --- a/base_tier_validation_waiting/README.rst +++ b/base_tier_validation_waiting/README.rst @@ -19,9 +19,9 @@ Base Tier Validation - Waiting status .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png :target: https://translation.odoo-community.org/projects/server-ux-14-0/server-ux-14-0-base_tier_validation_waiting :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png - :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/server-ux&target_branch=14.0 - :alt: Try me on Runboat +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/250/14.0 + :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| diff --git a/base_tier_validation_waiting/static/description/index.html b/base_tier_validation_waiting/static/description/index.html index e11b3b5c54..35089b2c4f 100644 --- a/base_tier_validation_waiting/static/description/index.html +++ b/base_tier_validation_waiting/static/description/index.html @@ -3,7 +3,7 @@ - + Base Tier Validation - Waiting status