From 2698f5df888c79fe3f24acc5c4139c4091f6fc5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A0=20Gil=20Sorribes?= Date: Mon, 25 Feb 2019 11:34:23 +0100 Subject: [PATCH 01/41] [11.0][IMP] base_tier_validation fixup and extend tests [ADD] systray icon for pending reviews [FIX] Remove python safe_eval [ADD] base_tier_validation_formula and migration scripts [ADD] widget domain and python expression to define reviewer in tier definition [ADD] auto updating of systray icon counter [ADD] validation date field [ADD] review widget dropdown menu --- base_tier_validation_formula/README.rst | 81 ++++ base_tier_validation_formula/__init__.py | 1 + base_tier_validation_formula/__manifest__.py | 20 + .../models/__init__.py | 3 + .../models/tier_definition.py | 37 ++ .../models/tier_review.py | 47 ++ .../models/tier_validation.py | 25 ++ .../readme/CONTRIBUTORS.rst | 2 + .../readme/DESCRIPTION.rst | 2 + base_tier_validation_formula/readme/USAGE.rst | 2 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 405 ++++++++++++++++++ .../tests/__init__.py | 4 + base_tier_validation_formula/tests/common.py | 19 + .../tests/test_tier_validation.py | 112 +++++ .../tests/tier_validation_tester.py | 23 + .../views/tier_definition_view.xml | 25 ++ 17 files changed, 808 insertions(+) create mode 100644 base_tier_validation_formula/README.rst create mode 100644 base_tier_validation_formula/__init__.py create mode 100644 base_tier_validation_formula/__manifest__.py create mode 100644 base_tier_validation_formula/models/__init__.py create mode 100644 base_tier_validation_formula/models/tier_definition.py create mode 100644 base_tier_validation_formula/models/tier_review.py create mode 100644 base_tier_validation_formula/models/tier_validation.py create mode 100644 base_tier_validation_formula/readme/CONTRIBUTORS.rst create mode 100644 base_tier_validation_formula/readme/DESCRIPTION.rst create mode 100644 base_tier_validation_formula/readme/USAGE.rst create mode 100644 base_tier_validation_formula/static/description/icon.png create mode 100644 base_tier_validation_formula/static/description/index.html create mode 100644 base_tier_validation_formula/tests/__init__.py create mode 100644 base_tier_validation_formula/tests/common.py create mode 100644 base_tier_validation_formula/tests/test_tier_validation.py create mode 100644 base_tier_validation_formula/tests/tier_validation_tester.py create mode 100644 base_tier_validation_formula/views/tier_definition_view.xml diff --git a/base_tier_validation_formula/README.rst b/base_tier_validation_formula/README.rst new file mode 100644 index 0000000000..676e963766 --- /dev/null +++ b/base_tier_validation_formula/README.rst @@ -0,0 +1,81 @@ +============================ +Base Tier Validation Formula +============================ + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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/11.0/base_tier_validation_formula + :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-11-0/server-ux-11-0-base_tier_validation_formula + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/250/11.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module includes the ability to define the tier definition domain +and the tier reviewers using python code. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +To define the domain by python code choose the Formula option in the Definition field. +To define the reviewers by python code choose Python Expression option in the Validated by field. + +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 +~~~~~~~ + +* Creu Blanca + +Contributors +~~~~~~~~~~~~ + +* Enric Tobella +* Adrià Gil Sorribes + +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_formula/__init__.py b/base_tier_validation_formula/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/base_tier_validation_formula/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/base_tier_validation_formula/__manifest__.py b/base_tier_validation_formula/__manifest__.py new file mode 100644 index 0000000000..937e7e976c --- /dev/null +++ b/base_tier_validation_formula/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright 2019 Creu Blanca +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + 'name': 'Base Tier Validation Formula', + 'summary': """ + Formulas for Base tier validation""", + 'version': '11.0.1.0.0', + 'license': 'AGPL-3', + 'author': 'Creu Blanca,Odoo Community Association (OCA)', + 'website': 'www.creublanca.es', + 'depends': [ + 'base_tier_validation' + ], + 'data': [ + 'views/tier_definition_view.xml', + ], + 'demo': [ + ], +} diff --git a/base_tier_validation_formula/models/__init__.py b/base_tier_validation_formula/models/__init__.py new file mode 100644 index 0000000000..928b46c886 --- /dev/null +++ b/base_tier_validation_formula/models/__init__.py @@ -0,0 +1,3 @@ +from . import tier_definition +from . import tier_validation +from . import tier_review diff --git a/base_tier_validation_formula/models/tier_definition.py b/base_tier_validation_formula/models/tier_definition.py new file mode 100644 index 0000000000..86d4355308 --- /dev/null +++ b/base_tier_validation_formula/models/tier_definition.py @@ -0,0 +1,37 @@ +# Copyright 2019 Creu Blanca +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, api, models + + +class TierDefinition(models.Model): + _inherit = 'tier.definition' + + python_code = fields.Text( + string='Tier Definition Expression', + help="Write Python code that defines when this tier confirmation " + "will be needed. The result of executing the expresion must be " + "a boolean.", + default="""# Available locals:\n# - rec: current record""", + ) + definition_type = fields.Selection( + selection_add=[('formula', 'Formula')] + ) + reviewer_expression = fields.Text( + string='Review Expression', + help="Write Python code that defines the reviewer. " + "The result of executing the expression must be a res.users " + "recordset.", + default="# Available locals:\n# - rec: current record\n" + "# - Expects a recordset of res.users", + ) + review_type = fields.Selection( + selection_add=[("expression", "Python Expression")] + ) + + @api.onchange('review_type') + def onchange_review_type(self): + super(TierDefinition, self).onchange_review_type() + self.reviewer_expression = "# Available locals:\n" \ + "# - rec: current record\n" \ + "# - Expects a recordset of res.users" diff --git a/base_tier_validation_formula/models/tier_review.py b/base_tier_validation_formula/models/tier_review.py new file mode 100644 index 0000000000..6a128dd40d --- /dev/null +++ b/base_tier_validation_formula/models/tier_review.py @@ -0,0 +1,47 @@ +# Copyright 2019 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models, _ +from odoo.exceptions import UserError +from odoo.tools.safe_eval import safe_eval + + +class TierReview(models.Model): + _inherit = "tier.review" + + python_reviewer_ids = fields.Many2many( + string="Reviewers from Python expression", comodel_name="res.users", + compute="_compute_python_reviewer_ids", store=True + ) + + @api.depends('reviewer_id', 'reviewer_group_id', 'reviewer_group_id.users', + 'python_reviewer_ids') + def _compute_reviewer_ids(self): + super(TierReview, self)._compute_reviewer_ids() + for rec in self: + rec.reviewer_ids = rec.reviewer_id + rec.reviewer_group_id.users \ + + rec.python_reviewer_ids + + @api.multi + @api.depends('definition_id.reviewer_expression', + 'review_type', 'model', 'res_id') + def _compute_python_reviewer_ids(self): + for rec in self: + if rec.review_type == 'expression': + record = rec.env[rec.model].browse(rec.res_id).exists() + try: + reviewer_ids = safe_eval( + rec.definition_id.reviewer_expression, + globals_dict={'rec': record}) + except Exception as error: + raise UserError(_( + "Error evaluating tier validation " + "conditions.\n %s") % error) + # Check if python expression returns 'res.users' recordset + if not isinstance(reviewer_ids, models.Model) or \ + reviewer_ids._name != 'res.users': + raise UserError(_( + "Reviewer python expression must return a " + "res.users recordset.")) + else: + rec.python_reviewer_ids = reviewer_ids diff --git a/base_tier_validation_formula/models/tier_validation.py b/base_tier_validation_formula/models/tier_validation.py new file mode 100644 index 0000000000..f4545ad8f4 --- /dev/null +++ b/base_tier_validation_formula/models/tier_validation.py @@ -0,0 +1,25 @@ +# Copyright 2019 Creu Blanca +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, models, _ +from odoo.tools.safe_eval import safe_eval +from odoo.exceptions import UserError + + +class TierValidation(models.AbstractModel): + _inherit = 'tier.validation' + + @api.multi + def evaluate_formula_tier(self, tier): + try: + res = safe_eval(tier.python_code, globals_dict={'rec': self}) + except Exception as error: + raise UserError(_( + "Error evaluating tier validation conditions.\n %s") % error) + return res + + @api.multi + def evaluate_tier(self, tier): + if tier.definition_type == 'formula': + return self.evaluate_formula_tier(tier) + return super().evaluate_tier(tier) diff --git a/base_tier_validation_formula/readme/CONTRIBUTORS.rst b/base_tier_validation_formula/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..82054b4918 --- /dev/null +++ b/base_tier_validation_formula/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Enric Tobella +* Adrià Gil Sorribes diff --git a/base_tier_validation_formula/readme/DESCRIPTION.rst b/base_tier_validation_formula/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..cbaee80714 --- /dev/null +++ b/base_tier_validation_formula/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module includes the ability to define the tier definition domain +and the tier reviewers using python code. diff --git a/base_tier_validation_formula/readme/USAGE.rst b/base_tier_validation_formula/readme/USAGE.rst new file mode 100644 index 0000000000..d8ab6f9289 --- /dev/null +++ b/base_tier_validation_formula/readme/USAGE.rst @@ -0,0 +1,2 @@ +To define the domain by python code choose the Formula option in the Definition field. +To define the reviewers by python code choose Python Expression option in the Validated by field. diff --git a/base_tier_validation_formula/static/description/icon.png b/base_tier_validation_formula/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_formula/static/description/index.html b/base_tier_validation_formula/static/description/index.html new file mode 100644 index 0000000000..2b288abc5e --- /dev/null +++ b/base_tier_validation_formula/static/description/index.html @@ -0,0 +1,405 @@ + + + + + + +Base Tier Validation Formula + + + +
+

Base Tier Validation Formula

+ + +

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

+

This module includes the ability to define the tier definition domain +and the tier reviewers using python code.

+

Table of contents

+ +
+

Usage

+

To define the domain by python code choose the Formula option in the Definition field. +To define the reviewers by python code choose Python Expression option in the Validated by field.

+
+
+

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

+
    +
  • Creu Blanca
    • +
+
+
+

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_formula/tests/__init__.py b/base_tier_validation_formula/tests/__init__.py new file mode 100644 index 0000000000..c5d19b1934 --- /dev/null +++ b/base_tier_validation_formula/tests/__init__.py @@ -0,0 +1,4 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import common +from . import test_tier_validation diff --git a/base_tier_validation_formula/tests/common.py b/base_tier_validation_formula/tests/common.py new file mode 100644 index 0000000000..79b92d0185 --- /dev/null +++ b/base_tier_validation_formula/tests/common.py @@ -0,0 +1,19 @@ +# Copyright 2018 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + + +def setup_test_model(env, model_clses): + for model_cls in model_clses: + model_cls._build_model(env.registry, env.cr) + + env.registry.setup_models(env.cr) + env.registry.init_models( + env.cr, [model_cls._name for model_cls in model_clses], + dict(env.context, update_custom_fields=True) + ) + + +def teardown_test_model(env, model_clses): + for model_cls in model_clses: + del env.registry.models[model_cls._name] + env.registry.setup_models(env.cr) diff --git a/base_tier_validation_formula/tests/test_tier_validation.py b/base_tier_validation_formula/tests/test_tier_validation.py new file mode 100644 index 0000000000..e94bed9966 --- /dev/null +++ b/base_tier_validation_formula/tests/test_tier_validation.py @@ -0,0 +1,112 @@ +# Copyright 2018 Eficent Business and IT Consulting Services S.L. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from odoo.tests import common +from odoo.exceptions import UserError +from .common import setup_test_model, teardown_test_model +from .tier_validation_tester import TierValidationTester + + +@common.at_install(False) +@common.post_install(True) +class TierTierValidation(common.SavepointCase): + + @classmethod + def setUpClass(cls): + super(TierTierValidation, cls).setUpClass() + + setup_test_model(cls.env, [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', + }) + cls.test_user_3 = cls.env['res.users'].create({ + 'name': 'Mary', + 'login': 'test3', + }) + + # 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)]", + }) + + cls.test_record = cls.test_model.create({ + 'test_field': 2.5, + }) + + @classmethod + def tearDownClass(cls): + teardown_test_model(cls.env, + [TierValidationTester]) + super(TierTierValidation, cls).tearDownClass() + + def test_01_reviewer_from_python_expression(self): + tier_definition = self.tier_def_obj.create({ + 'model_id': self.tester_model.id, + 'review_type': 'individual', + 'reviewer_id': self.test_user_1.id, + 'definition_type': 'formula', + 'python_code': 'rec.test_field > 1.0', + }) + tier_definition.write({ + 'model_id': self.tester_model.id, + 'review_type': 'expression', + 'python_code': 'rec.test_field > 3.0', + }) + tier_definition.onchange_review_type() + tier_definition.write({ + 'reviewer_expression': 'rec.user_id', + }) + self.test_record.write({ + 'test_field': 3.5, + 'user_id': self.test_user_2.id, + }) + reviews = self.test_record.sudo( + self.test_user_3.id).request_validation() + self.assertTrue(reviews) + self.assertEqual(len(reviews), 2) + record = self.test_record.sudo(self.test_user_1.id) + self.assertIn(self.test_user_1, record.reviewer_ids) + self.assertIn(self.test_user_2, record.reviewer_ids) + res = self.test_model.search( + [('reviewer_ids', 'in', self.test_user_2.id)]) + self.assertTrue(res) + + def test_02_wrong_reviewer_expression(self): + """Error should raise with incorrect python expresions on + tier definitions.""" + self.tier_def_obj.create({ + 'model_id': self.tester_model.id, + 'review_type': 'expression', + 'reviewer_expression': 'rec.test_field', + 'python_code': 'rec.test_field > 1.0', + }) + with self.assertRaises(UserError): + self.test_record.sudo(self.test_user_3.id).request_validation() diff --git a/base_tier_validation_formula/tests/tier_validation_tester.py b/base_tier_validation_formula/tests/tier_validation_tester.py new file mode 100644 index 0000000000..d0136be3b4 --- /dev/null +++ b/base_tier_validation_formula/tests/tier_validation_tester.py @@ -0,0 +1,23 @@ +# Copyright 2018 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models + + +class TierValidationTester(models.Model): + _name = 'tier.validation.tester' + _inherit = ['tier.validation'] + + state = fields.Selection( + selection=[('draft', 'Draft'), + ('confirmed', 'Confirmed'), + ('cancel', 'Cancel')], + default='draft', + ) + test_field = fields.Float() + user_id = fields.Many2one(string="Assigned to:", + comodel_name="res.users") + + @api.multi + def action_confirm(self): + self.write({'state': 'confirmed'}) diff --git a/base_tier_validation_formula/views/tier_definition_view.xml b/base_tier_validation_formula/views/tier_definition_view.xml new file mode 100644 index 0000000000..8498b0841f --- /dev/null +++ b/base_tier_validation_formula/views/tier_definition_view.xml @@ -0,0 +1,25 @@ + + + + + + tier.definition.form + tier.definition + + + + + + + + + + + + + + From d674d4555ddd52962834c3cc6cdeb54c0e33c1bd Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Wed, 10 Apr 2019 13:55:25 +0200 Subject: [PATCH 02/41] [IMP] base_tier_validation: Pass parameters as functions --- base_tier_validation_formula/models/tier_review.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/base_tier_validation_formula/models/tier_review.py b/base_tier_validation_formula/models/tier_review.py index 6a128dd40d..b1889c394c 100644 --- a/base_tier_validation_formula/models/tier_review.py +++ b/base_tier_validation_formula/models/tier_review.py @@ -14,13 +14,13 @@ class TierReview(models.Model): compute="_compute_python_reviewer_ids", store=True ) - @api.depends('reviewer_id', 'reviewer_group_id', 'reviewer_group_id.users', - 'python_reviewer_ids') - def _compute_reviewer_ids(self): - super(TierReview, self)._compute_reviewer_ids() - for rec in self: - rec.reviewer_ids = rec.reviewer_id + rec.reviewer_group_id.users \ - + rec.python_reviewer_ids + @api.model + def _get_reviewer_fields(self): + res = super()._get_reviewer_fields() + return res + ['python_reviewer_ids'] + + def _get_reviewers(self): + return super()._get_reviewers() + self.python_reviewer_ids @api.multi @api.depends('definition_id.reviewer_expression', From ff967c44c2dab8b8e8c0056ecfa7bf47fe37cb47 Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Tue, 28 May 2019 14:33:47 +0200 Subject: [PATCH 03/41] [12.0][MIG] base_tier_validation_formula --- base_tier_validation_formula/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base_tier_validation_formula/__manifest__.py b/base_tier_validation_formula/__manifest__.py index 937e7e976c..e327b182bd 100644 --- a/base_tier_validation_formula/__manifest__.py +++ b/base_tier_validation_formula/__manifest__.py @@ -5,7 +5,7 @@ 'name': 'Base Tier Validation Formula', 'summary': """ Formulas for Base tier validation""", - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'license': 'AGPL-3', 'author': 'Creu Blanca,Odoo Community Association (OCA)', 'website': 'www.creublanca.es', From 6eeac42b9af7ba8170526186021a0467b05a2c8c Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 28 May 2019 16:26:35 +0000 Subject: [PATCH 04/41] [UPD] README.rst --- base_tier_validation_formula/README.rst | 10 +++--- .../static/description/index.html | 36 +++++++++++++++---- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/base_tier_validation_formula/README.rst b/base_tier_validation_formula/README.rst index 676e963766..f2a11786e7 100644 --- a/base_tier_validation_formula/README.rst +++ b/base_tier_validation_formula/README.rst @@ -14,13 +14,13 @@ Base Tier Validation Formula :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/11.0/base_tier_validation_formula + :target: https://github.com/OCA/server-ux/tree/12.0/base_tier_validation_formula :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-11-0/server-ux-11-0-base_tier_validation_formula + :target: https://translation.odoo-community.org/projects/server-ux-12-0/server-ux-12-0-base_tier_validation_formula :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/250/11.0 + :target: https://runbot.odoo-community.org/runbot/250/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -45,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 smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -76,6 +76,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/server-ux `_ project on GitHub. +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_formula/static/description/index.html b/base_tier_validation_formula/static/description/index.html index 2b288abc5e..02b4b57b01 100644 --- a/base_tier_validation_formula/static/description/index.html +++ b/base_tier_validation_formula/static/description/index.html @@ -3,13 +3,13 @@ - + Base Tier Validation Formula