odoo-addon-base-tier-validation 17.0.2.3.3__py3-none-any.whl → 18.0.1.0.0.8__py3-none-any.whl

odoo/addons/base_tier_validation/i18n/zh_CN.po

@@ -55,56 +55,48 @@ msgstr ""
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_validation.py:0
-#, python-format
 msgid "A record to be reviewed has been created by %s."
 msgstr ""
 
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_review.py:0
-#, python-format
 msgid "A review has been requested %s days ago."
 msgstr ""
 
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_validation.py:0
-#, python-format
 msgid "A review has been requested by %s."
 msgstr "%s 发起审批请求。"
 
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_validation.py:0
-#, python-format
 msgid "A review was accepted"
 msgstr "审批已通过"
 
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_validation.py:0
-#, python-format
 msgid "A review was accepted. (%s)"
 msgstr "审批已通过。 ( %s )"
 
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_validation.py:0
-#, python-format
 msgid "A review was rejected by %(user)s. (%(comment)s)"
 msgstr ""
 
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_validation.py:0
-#, python-format
 msgid "A review was rejected by %s."
 msgstr "%s 驳回了审批。"
 
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_validation.py:0
-#, python-format
 msgid "A validation process is still open for at least one record."
 msgstr "当前记录存在待批复的审批流程。"
 
@@ -113,13 +105,6 @@ msgstr "当前记录存在待批复的审批流程。"
 msgid "Active"
 msgstr "有效"
 
-#. module: base_tier_validation
-#. odoo-javascript
-#: code:addons/base_tier_validation/static/src/components/tier_review_menu/tier_review_menu.xml:0
-#, python-format
-msgid "Activity"
-msgstr ""
-
 #. module: base_tier_validation
 #: model_terms:ir.ui.view,arch_db:base_tier_validation.tier_definition_view_search
 msgid "All"
@@ -176,7 +161,6 @@ msgstr ""
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_validation_exception.py:0
-#, python-format
 msgid ""
 "At least one of these fields must be checked! Write under Validation, Write "
 "after Validation"
@@ -216,7 +200,6 @@ msgstr "取消"
 #: model:ir.model.fields,field_description:base_tier_validation.field_tier_definition__has_comment
 #: model:ir.model.fields,field_description:base_tier_validation.field_tier_review__has_comment
 #: model_terms:ir.ui.view,arch_db:base_tier_validation.view_comment_wizard
-#, python-format
 msgid "Comment"
 msgstr "审批意见"
 
@@ -280,7 +263,6 @@ msgstr "定义域"
 #: code:addons/base_tier_validation/static/src/components/tier_review_widget/tier_review_widget.xml:0
 #: model:ir.model.fields,field_description:base_tier_validation.field_tier_definition__name
 #: model:ir.model.fields,field_description:base_tier_validation.field_tier_review__name
-#, python-format
 msgid "Description"
 msgstr "说明"
 
@@ -310,7 +292,6 @@ msgstr "审批人"
 #. module: base_tier_validation
 #. odoo-javascript
 #: code:addons/base_tier_validation/static/src/components/tier_review_widget/tier_review_widget.xml:0
-#, python-format
 msgid "Done by"
 msgstr "审批人"
 
@@ -327,7 +308,6 @@ msgstr ""
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_review.py:0
-#, python-format
 msgid "Group %s"
 msgstr ""
 
@@ -360,8 +340,6 @@ msgid "ID"
 msgstr "ID"
 
 #. module: base_tier_validation
-#: model:ir.model.fields,help:base_tier_validation.field_tier_definition__has_comment
-#: model:ir.model.fields,help:base_tier_validation.field_tier_review__has_comment
 #: model:ir.model.fields,help:base_tier_validation.field_tier_validation__has_comment
 msgid "If set, Allow the reviewer to leave a comment on the review."
 msgstr ""
@@ -464,7 +442,6 @@ msgstr "需要审批"
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_definition.py:0
-#, python-format
 msgid "New Tier Validation"
 msgstr "新建多层级审批"
 
@@ -476,14 +453,12 @@ msgstr ""
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_validation.py:0
-#, python-format
 msgid "Next: %s"
 msgstr ""
 
 #. module: base_tier_validation
 #. odoo-javascript
 #: code:addons/base_tier_validation/static/src/components/tier_review_menu/tier_review_menu.xml:0
-#, python-format
 msgid "No reviews to do."
 msgstr "没有待审批的项目。"
 
@@ -526,20 +501,6 @@ msgid ""
 "record:"
 msgstr ""
 
-#. module: base_tier_validation
-#. odoo-python
-#: code:addons/base_tier_validation/models/tier_validation.py:0
-#, python-format
-msgid "Operation has been <b>rejected</b>."
-msgstr ""
-
-#. module: base_tier_validation
-#. odoo-python
-#: code:addons/base_tier_validation/models/tier_validation.py:0
-#, python-format
-msgid "Operation has been <b>validated</b>!"
-msgstr ""
-
 #. module: base_tier_validation
 #: model_terms:ir.ui.view,arch_db:base_tier_validation.res_config_settings_view_form_budget
 msgid "Option to use python formula to get reviewers and find documents"
@@ -550,7 +511,6 @@ msgstr ""
 #: code:addons/base_tier_validation/static/src/components/tier_review_menu/tier_review_menu.xml:0
 #: model:ir.model.fields.selection,name:base_tier_validation.selection__tier_review__status__pending
 #: model:ir.model.fields.selection,name:base_tier_validation.selection__tier_validation__validation_status__pending
-#, python-format
 msgid "Pending"
 msgstr "待审批"
 
@@ -599,7 +559,6 @@ msgstr "发起人"
 #. module: base_tier_validation
 #. odoo-javascript
 #: code:addons/base_tier_validation/static/src/components/tier_review_widget/tier_review_widget.xml:0
-#, python-format
 msgid "Requested by"
 msgstr "发起人"
 
@@ -619,6 +578,8 @@ msgid "Restart Validation"
 msgstr ""
 
 #. module: base_tier_validation
+#. odoo-javascript
+#: code:addons/base_tier_validation/static/src/components/tier_review_menu/tier_review_menu.xml:0
 #: model:ir.model.fields,field_description:base_tier_validation.field_comment_wizard__review_ids
 msgid "Review"
 msgstr "审批"
@@ -652,7 +613,6 @@ msgstr "审批者"
 #: code:addons/base_tier_validation/static/src/components/tier_review_menu/tier_review_menu.xml:0
 #: code:addons/base_tier_validation/static/src/components/tier_review_widget/tier_review_widget.xml:0
 #: model:ir.model.fields,field_description:base_tier_validation.field_res_users__review_ids
-#, python-format
 msgid "Reviews"
 msgstr "审批"
 
@@ -670,7 +630,6 @@ msgstr ""
 #. odoo-javascript
 #: code:addons/base_tier_validation/static/src/components/tier_review_widget/tier_review_widget.xml:0
 #: model:ir.model.fields,field_description:base_tier_validation.field_tier_definition__sequence
-#, python-format
 msgid "Sequence"
 msgstr "序号"
 
@@ -683,35 +642,24 @@ msgstr "指定用户"
 #. odoo-javascript
 #: code:addons/base_tier_validation/static/src/components/tier_review_widget/tier_review_widget.xml:0
 #: model:ir.model.fields,field_description:base_tier_validation.field_tier_review__status
-#, python-format
 msgid "Status"
 msgstr "状态"
 
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_validation.py:0
-#, python-format
 msgid "The review has been reset by %s."
 msgstr ""
 
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_review.py:0
-#, python-format
 msgid "There are no res.users in the selected field"
 msgstr ""
 
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_validation.py:0
-#, python-format
-msgid "This %s needs to be validated"
-msgstr ""
-
-#. module: base_tier_validation
-#. odoo-python
-#: code:addons/base_tier_validation/models/tier_validation.py:0
-#, python-format
 msgid ""
 "This action needs to be validated for at least one record. Reviews pending:\n"
 " - %s \n"
@@ -809,7 +757,6 @@ msgstr ""
 #. module: base_tier_validation
 #. odoo-javascript
 #: code:addons/base_tier_validation/static/src/components/tier_review_widget/tier_review_widget.xml:0
-#, python-format
 msgid "Todo by"
 msgstr ""
 
@@ -859,7 +806,6 @@ msgstr "审批人"
 #. odoo-javascript
 #: code:addons/base_tier_validation/static/src/components/tier_review_widget/tier_review_widget.xml:0
 #: model:ir.model.fields,field_description:base_tier_validation.field_tier_review__reviewed_date
-#, python-format
 msgid "Validation Date"
 msgstr "审批日期"
 
@@ -912,25 +858,23 @@ msgstr ""
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_validation.py:0
-#, python-format
 msgid ""
 "You are not allowed to write those fields after validation.\n"
-"- %(not_allowed_fields)s\n"
+"- %(not_allowed_fields_str)s\n"
 "\n"
 "Only those fields can be modified:\n"
-"- %(allowed_fields)s"
+"- %(allowed_fields_str)s"
 msgstr ""
 
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_validation.py:0
-#, python-format
 msgid ""
 "You are not allowed to write those fields under validation.\n"
-"- %(not_allowed_fields)s\n"
+"- %(not_allowed_fields_str)s\n"
 "\n"
 "Only those fields can be modified:\n"
-"- %(allowed_fields)s"
+"- %(allowed_fields_str)s"
 msgstr ""
 
 #. module: base_tier_validation

odoo/addons/base_tier_validation/models/res_users.py

@@ -12,37 +12,43 @@ class Users(models.Model):
     @api.model
     def review_user_count(self):
         user_reviews = {}
+        user = self.env.user
         domain = [
             ("status", "=", "pending"),
             ("can_review", "=", True),
-            ("id", "in", self.env.user.review_ids.ids),
+            ("id", "in", user.review_ids.ids),
         ]
-        review_groups = self.env["tier.review"].read_group(domain, ["model"], ["model"])
-        for review_group in review_groups:
-            model = review_group["model"]
+        review_groups = self.env["tier.review"]._read_group(
+            domain=domain,
+            groupby=["model"],
+            aggregates=["id:recordset"],
+        )
+        for model, tier_review in review_groups:
             Model = self.env[model]
-            reviews = self.env["tier.review"].search(review_group.get("__domain"))
             # Skip Models not having Tier Validation enabled (example: was unistalled)
-            if reviews and hasattr(Model, "can_review"):
+            if tier_review and hasattr(Model, "can_review"):
+                records_domain = [
+                    ("id", "in", tier_review.mapped("res_id")),
+                    ("rejected", "=", False),
+                    ("can_review", "=", True),
+                ]
                 records = (
-                    Model.with_user(self.env.user)
+                    Model.with_user(user)
                     .with_context(active_test=False)
-                    .search([("id", "in", reviews.mapped("res_id"))])
-                    .filtered(lambda x: not x.rejected and x.can_review)
+                    .search(records_domain)
                 )
                 # Excludes any cancelled records depending on the structure of the model
-                if self.env[model]._state_field in self.env[model]._fields:
+                if Model._state_field in Model._fields:
                     records = records.filtered(
                         lambda x: x[x._state_field] != x._cancel_state
                     )
                 if records:
-                    record = self.env[model]
                     user_reviews[model] = {
                         "id": records[0].id,
-                        "name": record._description,
+                        "name": Model._description,
                         "model": model,
-                        "active_field": "active" in record._fields,
-                        "icon": modules.module.get_module_icon(record._original_module),
+                        "active_field": "active" in Model._fields,
+                        "icon": modules.module.get_module_icon(Model._original_module),
                         "type": "tier_review",
                         "pending_count": len(records),
                     }

odoo/addons/base_tier_validation/models/tier_definition.py

@@ -1,7 +1,7 @@
 # Copyright 2017 ForgeFlow S.L. (https://www.forgeflow.com)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 
 
 class TierDefinition(models.Model):
@@ -10,7 +10,7 @@ class TierDefinition(models.Model):
 
     @api.model
     def _get_default_name(self):
-        return _("New Tier Validation")
+        return self.env._("New Tier Validation")
 
     @api.model
     def _get_tier_validation_model_names(self):
@@ -93,11 +93,7 @@ class TierDefinition(models.Model):
         help="If set, reviewers will be notified by email when a reviews related "
         "to this definition are restarted.",
     )
-    has_comment = fields.Boolean(
-        string="Comment",
-        default=False,
-        help="If set, Allow the reviewer to leave a comment on the review.",
-    )
+    has_comment = fields.Boolean(string="Comment", default=False)
     notify_reminder_delay = fields.Integer(
         string="Send reminder message on pending reviews",
         help="Number of days after which a message must be posted to remind about "
@@ -120,12 +116,18 @@ class TierDefinition(models.Model):
 
     @api.depends("review_type", "model_id")
     def _compute_domain_reviewer_field(self):
-        for rec in self:
-            rec.valid_reviewer_field_ids = (
-                self.env["ir.model.fields"]
-                .sudo()
-                .search([("model", "=", rec.model), ("relation", "=", "res.users")])
+        models = self.mapped("model")
+        valid_reviewer_fields = dict(
+            self.env["ir.model.fields"]
+            .sudo()
+            ._read_group(
+                domain=[("model", "in", models), ("relation", "=", "res.users")],
+                groupby=["model"],
+                aggregates=["id:array_agg"],
             )
+        )
+        for rec in self:
+            rec.valid_reviewer_field_ids = valid_reviewer_fields.get(rec.model, [])
 
     def _get_review_needing_reminder(self):
         """Return all the reviews that have the reminder setup."""

odoo/addons/base_tier_validation/models/tier_review.py

@@ -5,7 +5,7 @@ import logging
 
 import pytz
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import ValidationError
 
 _logger = logging.getLogger(__name__)
@@ -15,7 +15,7 @@ class TierReview(models.Model):
     _name = "tier.review"
     _description = "Tier Review"
 
-    name = fields.Char(related="definition_id.name", readonly=True)
+    name = fields.Char(related="definition_id.name")
     status = fields.Selection(
         [
             ("waiting", "Waiting"),
@@ -32,14 +32,10 @@ class TierReview(models.Model):
         related="definition_id.company_id",
         store=True,
     )
-    review_type = fields.Selection(related="definition_id.review_type", readonly=True)
-    reviewer_id = fields.Many2one(related="definition_id.reviewer_id", readonly=True)
-    reviewer_group_id = fields.Many2one(
-        related="definition_id.reviewer_group_id", readonly=True
-    )
-    reviewer_field_id = fields.Many2one(
-        related="definition_id.reviewer_field_id", readonly=True
-    )
+    review_type = fields.Selection(related="definition_id.review_type")
+    reviewer_id = fields.Many2one(related="definition_id.reviewer_id")
+    reviewer_group_id = fields.Many2one(related="definition_id.reviewer_group_id")
+    reviewer_field_id = fields.Many2one(related="definition_id.reviewer_field_id")
     reviewer_ids = fields.Many2many(
         string="Reviewers",
         comodel_name="res.users",
@@ -55,7 +51,7 @@ class TierReview(models.Model):
     reviewed_formated_date = fields.Char(
         string="Validation Formated Date", compute="_compute_reviewed_formated_date"
     )
-    has_comment = fields.Boolean(related="definition_id.has_comment", readonly=True)
+    has_comment = fields.Boolean(related="definition_id.has_comment")
     comment = fields.Char(string="Comments")
     can_review = fields.Boolean(
         compute="_compute_can_review",
@@ -63,11 +59,9 @@ class TierReview(models.Model):
         help="""Can review will be marked if the review is pending and the
         approve sequence has been achieved""",
     )
-    approve_sequence = fields.Boolean(
-        related="definition_id.approve_sequence", readonly=True
-    )
+    approve_sequence = fields.Boolean(related="definition_id.approve_sequence")
     approve_sequence_bypass = fields.Boolean(
-        related="definition_id.approve_sequence_bypass", readonly=True
+        related="definition_id.approve_sequence_bypass"
     )
     last_reminder_date = fields.Datetime(readonly=True)
 
@@ -141,7 +135,7 @@ class TierReview(models.Model):
         for rec in self:
             todo_by = False
             if rec.reviewer_group_id:
-                todo_by = _("Group %s") % rec.reviewer_group_id.name
+                todo_by = self.env._("Group %s", rec.reviewer_group_id.name)
             else:
                 todo_by = ", ".join(rec.reviewer_ids[:num_show].mapped("display_name"))
                 num_users = len(rec.reviewer_ids)
@@ -157,7 +151,9 @@ class TierReview(models.Model):
             resource = self.env[self.model].browse(self.res_id)
             reviewer_field = getattr(resource, self.reviewer_field_id.name, False)
             if not reviewer_field or not reviewer_field._name == "res.users":
-                raise ValidationError(_("There are no res.users in the selected field"))
+                raise ValidationError(
+                    self.env._("There are no res.users in the selected field")
+                )
         return reviewer_field
 
     def _notify_pending_status(self, review_ids):
@@ -173,7 +169,7 @@ class TierReview(models.Model):
 
     def _notify_review_reminder_body(self):
         delay = (fields.Datetime.now() - self.create_date).days
-        return _("A review has been requested %s days ago.") % (delay)
+        return self.env._("A review has been requested %s days ago.", delay)
 
     def _send_review_reminder(self):
         record = self.env[self.model].browse(self.res_id)
@@ -183,7 +179,7 @@ class TierReview(models.Model):
         elif hasattr(record, "message_post"):
             self._notify_review_reminder(record)
         else:
-            msg = "Could not send reminder for record %s" % record
+            msg = f"Could not send reminder for record {record}"
             _logger.exception(msg)
         self.last_reminder_date = fields.Datetime.now()