odoo-addon-base-tier-validation 16.0.1.0.4.29__py3-none-any.whl → 16.0.1.5.1__py3-none-any.whl

odoo/addons/base_tier_validation/i18n/zh_CN.po

@@ -54,6 +54,11 @@ msgstr ""
 msgid "<span class=\"oe_edit_only\">Name</span>"
 msgstr "<span class=\"oe_edit_only\">名称</span>"
 
+#. module: base_tier_validation
+#: model_terms:ir.ui.view,arch_db:base_tier_validation.tier_definition_view_form
+msgid "<span>Bypassed, if previous tier was validated by same reviewer</span>"
+msgstr ""
+
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_validation.py:0
@@ -129,6 +134,12 @@ msgstr ""
 msgid "Approval order by the specified sequence number"
 msgstr "审批按指定序号排序"
 
+#. module: base_tier_validation
+#: model:ir.model.fields,field_description:base_tier_validation.field_tier_definition__approve_sequence_bypass
+#: model:ir.model.fields,field_description:base_tier_validation.field_tier_review__approve_sequence_bypass
+msgid "Approve Sequence Bypass"
+msgstr ""
+
 #. module: base_tier_validation
 #: model:ir.model.fields,field_description:base_tier_validation.field_tier_definition__approve_sequence
 #: model:ir.model.fields,field_description:base_tier_validation.field_tier_review__approve_sequence
@@ -140,6 +151,18 @@ msgstr "按顺序审批"
 msgid "Approved"
 msgstr "已批准"
 
+#. module: base_tier_validation
+#: model_terms:ir.ui.view,arch_db:base_tier_validation.tier_definition_view_form
+msgid "Archived"
+msgstr ""
+
+#. module: base_tier_validation
+#: model:ir.model.fields,help:base_tier_validation.field_tier_definition__approve_sequence_bypass
+#: model:ir.model.fields,help:base_tier_validation.field_tier_review__approve_sequence_bypass
+msgid ""
+"Bypassed (auto validated), if previous tier was validated by same reviewer"
+msgstr ""
+
 #. module: base_tier_validation
 #: model:ir.model.fields,field_description:base_tier_validation.field_tier_review__can_review
 #: model:ir.model.fields,field_description:base_tier_validation.field_tier_validation__can_review
@@ -159,8 +182,8 @@ msgid "Cancel"
 msgstr "取消"
 
 #. module: base_tier_validation
-#. odoo-javascript
 #. odoo-python
+#. odoo-javascript
 #: code:addons/base_tier_validation/models/tier_validation.py:0
 #: code:addons/base_tier_validation/static/src/xml/tier_review_template.xml:0
 #: model:ir.model.fields,field_description:base_tier_validation.field_comment_wizard__comment
@@ -233,6 +256,11 @@ msgstr "说明"
 msgid "Display Name"
 msgstr "显示名称"
 
+#. module: base_tier_validation
+#: model:ir.model.fields,field_description:base_tier_validation.field_tier_review__display_status
+msgid "Display Status"
+msgstr ""
+
 #. module: base_tier_validation
 #: model:ir.model.fields.selection,name:base_tier_validation.selection__tier_definition__definition_type__domain
 msgid "Domain"
@@ -286,6 +314,27 @@ msgid ""
 "definition is triggered."
 msgstr "如果设置，则触发此定义规则时将通过电子邮件通知所有的审批人。"
 
+#. module: base_tier_validation
+#: model:ir.model.fields,help:base_tier_validation.field_tier_definition__notify_on_accepted
+msgid ""
+"If set, reviewers will be notified by email when a review related to this "
+"definition is accepted."
+msgstr ""
+
+#. module: base_tier_validation
+#: model:ir.model.fields,help:base_tier_validation.field_tier_definition__notify_on_rejected
+msgid ""
+"If set, reviewers will be notified by email when a review related to this "
+"definition is rejected."
+msgstr ""
+
+#. module: base_tier_validation
+#: model:ir.model.fields,help:base_tier_validation.field_tier_definition__notify_on_restarted
+msgid ""
+"If set, reviewers will be notified by email when a reviews related to this "
+"definition are restarted."
+msgstr ""
+
 #. module: base_tier_validation
 #: model:ir.model.fields,field_description:base_tier_validation.field_comment_wizard____last_update
 #: model:ir.model.fields,field_description:base_tier_validation.field_tier_definition____last_update
@@ -349,11 +398,26 @@ msgstr ""
 msgid "No reviews to do."
 msgstr "没有待审批的项目。"
 
+#. module: base_tier_validation
+#: model:ir.model.fields,field_description:base_tier_validation.field_tier_definition__notify_on_accepted
+msgid "Notify Reviewers on Accepted"
+msgstr ""
+
 #. module: base_tier_validation
 #: model:ir.model.fields,field_description:base_tier_validation.field_tier_definition__notify_on_create
 msgid "Notify Reviewers on Creation"
 msgstr "创建时通知审批人"
 
+#. module: base_tier_validation
+#: model:ir.model.fields,field_description:base_tier_validation.field_tier_definition__notify_on_rejected
+msgid "Notify Reviewers on Rejected"
+msgstr ""
+
+#. module: base_tier_validation
+#: model:ir.model.fields,field_description:base_tier_validation.field_tier_definition__notify_on_restarted
+msgid "Notify Reviewers on Restarted"
+msgstr ""
+
 #. module: base_tier_validation
 #. odoo-python
 #: code:addons/base_tier_validation/models/tier_validation.py:0
@@ -368,10 +432,21 @@ msgstr ""
 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 forward a tier validation to other reviewer, and backward"
+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"
+msgstr ""
+
 #. module: base_tier_validation
 #. odoo-javascript
 #: code:addons/base_tier_validation/static/src/xml/systray.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 "待审批"
@@ -389,6 +464,7 @@ msgstr ""
 #. module: base_tier_validation
 #: model:ir.model.fields,field_description:base_tier_validation.field_tier_validation__rejected
 #: model:ir.model.fields.selection,name:base_tier_validation.selection__tier_review__status__rejected
+#: model:ir.model.fields.selection,name:base_tier_validation.selection__tier_validation__validation_status__rejected
 msgid "Rejected"
 msgstr "已驳回"
 
@@ -481,6 +557,7 @@ msgstr "审批"
 #. odoo-javascript
 #: code:addons/base_tier_validation/static/src/xml/tier_review_template.xml:0
 #: model:ir.model.fields,field_description:base_tier_validation.field_tier_definition__sequence
+#: model:ir.model.fields,field_description:base_tier_validation.field_tier_review__sequence
 #, python-format
 msgid "Sequence"
 msgstr "序号"
@@ -537,11 +614,6 @@ msgstr ""
 "此操作需要至少对一条记录进行审批。\n"
 "请发起审批申请。"
 
-#. module: base_tier_validation
-#: model:ir.model.fields,field_description:base_tier_validation.field_tier_review__sequence
-msgid "Tier"
-msgstr "层级"
-
 #. module: base_tier_validation
 #: model:ir.actions.act_window,name:base_tier_validation.tier_definition_action
 #: model:ir.model,name:base_tier_validation.model_tier_definition
@@ -550,11 +622,26 @@ msgstr "层级"
 msgid "Tier Definition"
 msgstr "层级定义"
 
+#. module: base_tier_validation
+#: model:ir.model.fields,field_description:base_tier_validation.field_res_config_settings__module_base_tier_validation_formula
+msgid "Tier Formula"
+msgstr ""
+
+#. module: base_tier_validation
+#: model:ir.model.fields,field_description:base_tier_validation.field_res_config_settings__module_base_tier_validation_forward
+msgid "Tier Forward & Backward"
+msgstr ""
+
 #. module: base_tier_validation
 #: model:ir.model,name:base_tier_validation.model_tier_review
 msgid "Tier Review"
 msgstr "多层级审批"
 
+#. module: base_tier_validation
+#: model_terms:ir.ui.view,arch_db:base_tier_validation.res_config_settings_view_form_budget
+msgid "Tier Validation"
+msgstr ""
+
 #. module: base_tier_validation
 #: model:ir.model,name:base_tier_validation.model_tier_validation
 msgid "Tier Validation (abstract)"
@@ -626,6 +713,7 @@ msgstr "驳回"
 
 #. module: base_tier_validation
 #: model:ir.model.fields,field_description:base_tier_validation.field_tier_validation__validated
+#: model:ir.model.fields.selection,name:base_tier_validation.selection__tier_validation__validation_status__validated
 msgid "Validated"
 msgstr "已批准"
 
@@ -653,16 +741,29 @@ msgstr "审批日期"
 msgid "Validation Formated Date"
 msgstr ""
 
+#. module: base_tier_validation
+#: model:ir.model.fields,field_description:base_tier_validation.field_tier_validation__validation_status
+msgid "Validation Status"
+msgstr ""
+
 #. module: base_tier_validation
 #: model:ir.model.fields,field_description:base_tier_validation.field_tier_validation__review_ids
 msgid "Validations"
 msgstr "审批"
 
+#. module: base_tier_validation
+#: model:ir.model.fields.selection,name:base_tier_validation.selection__tier_validation__validation_status__no
+msgid "Without validation"
+msgstr ""
+
 #. module: base_tier_validation
 #: model_terms:ir.ui.view,arch_db:base_tier_validation.tier_definition_view_form
 msgid "e.g. Tier Validation for..."
 msgstr "例如：审批层级用于..."
 
+#~ msgid "Tier"
+#~ msgstr "层级"
+
 #, python-format
 #~ msgid "Activities"
 #~ msgstr "活动项目"

odoo/addons/base_tier_validation/models/res_config_settings.py

@@ -1,6 +1,6 @@
 # Copyright 2021 Ecosoft Co., Ltd. (http://ecosoft.co.th)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import models
+from odoo import fields, models
 
 
 class ResConfigSettings(models.TransientModel):
@@ -8,7 +8,7 @@ class ResConfigSettings(models.TransientModel):
 
     # Activate me back when modules are migrated
 
-    # module_base_tier_validation_formula = fields.Boolean(string="Tier Formula")
-    # module_base_tier_validation_forward = fields.Boolean("Tier Forward & Backward")
+    module_base_tier_validation_formula = fields.Boolean(string="Tier Formula")
+    module_base_tier_validation_forward = fields.Boolean("Tier Forward & Backward")
     # module_base_tier_validation_server_action = fields.Boolean("Tier Server Action")
     # module_base_tier_validation_report = fields.Boolean("Tier Reports")

odoo/addons/base_tier_validation/models/res_users.py

@@ -28,6 +28,11 @@ class Users(models.Model):
                     .search([("id", "in", reviews.mapped("res_id"))])
                     .filtered(lambda x: not x.rejected and x.can_review)
                 )
+                # Excludes any cancelled records depending on the structure of the model
+                if self.env[model]._state_field in self.env[model]._fields:
+                    records = records.filtered(
+                        lambda x: x[x._state_field] != x._cancel_state
+                    )
                 # if len(records):
                 for rec in records:
                     record = self.env[model]

odoo/addons/base_tier_validation/models/tier_definition.py

@@ -67,12 +67,30 @@ class TierDefinition(models.Model):
         help="If set, all possible reviewers will be notified by email when "
         "this definition is triggered.",
     )
+    notify_on_accepted = fields.Boolean(
+        string="Notify Reviewers on Accepted",
+        help="If set, reviewers will be notified by email when a review related "
+        "to this definition is accepted.",
+    )
+    notify_on_rejected = fields.Boolean(
+        string="Notify Reviewers on Rejected",
+        help="If set, reviewers will be notified by email when a review related "
+        "to this definition is rejected.",
+    )
+    notify_on_restarted = fields.Boolean(
+        string="Notify Reviewers on Restarted",
+        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)
     approve_sequence = fields.Boolean(
         string="Approve by sequence",
         default=False,
         help="Approval order by the specified sequence number",
     )
+    approve_sequence_bypass = fields.Boolean(
+        help="Bypassed (auto validated), if previous tier was validated by same reviewer",
+    )
 
     @api.onchange("review_type")
     def onchange_review_type(self):

odoo/addons/base_tier_validation/models/tier_review.py

@@ -41,6 +41,7 @@ class TierReview(models.Model):
         compute="_compute_reviewer_ids",
         store=True,
     )
+    display_status = fields.Char(compute="_compute_display_status")
     sequence = fields.Integer(string="Tier")
     todo_by = fields.Char(compute="_compute_todo_by", store=True)
     done_by = fields.Many2one(comodel_name="res.users")
@@ -60,6 +61,20 @@ class TierReview(models.Model):
     approve_sequence = fields.Boolean(
         related="definition_id.approve_sequence", readonly=True
     )
+    approve_sequence_bypass = fields.Boolean(
+        related="definition_id.approve_sequence_bypass", readonly=True
+    )
+
+    @api.depends("status")
+    def _compute_display_status(self):
+        """
+        Compute the display status based on the current status value to get the
+        translated status value.
+        """
+        selection = self.fields_get(["status"])["status"]["selection"]
+        selection_dict = dict(selection)
+        for record in self:
+            record.display_status = selection_dict[record.status]
 
     @api.depends_context("tz")
     def _compute_reviewed_formated_date(self):
@@ -68,9 +83,9 @@ class TierReview(models.Model):
             if not review.reviewed_date:
                 review.reviewed_formated_date = False
                 continue
-            requested_date_utc = pytz.timezone(timezone).localize(review.reviewed_date)
-            requested_date = requested_date_utc.astimezone(pytz.timezone(timezone))
-            review.reviewed_formated_date = requested_date.replace(tzinfo=None)
+            reviewed_date_utc = pytz.timezone("UTC").localize(review.reviewed_date)
+            reviewed_date_tz = reviewed_date_utc.astimezone(pytz.timezone(timezone))
+            review.reviewed_formated_date = reviewed_date_tz.replace(tzinfo=None)
 
     @api.depends("definition_id.approve_sequence")
     def _compute_can_review(self):