diff --git a/base_tier_validation/__manifest__.py b/base_tier_validation/__manifest__.py index 3d2ad910..e826d37b 100644 --- a/base_tier_validation/__manifest__.py +++ b/base_tier_validation/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Base Tier Validation", "summary": "Implement a validation process based on tiers.", - "version": "19.0.1.0.2", + "version": "19.0.1.0.3", "development_status": "Mature", "maintainers": ["LoisRForgeFlow"], "category": "Tools", diff --git a/base_tier_validation/models/tier_validation.py b/base_tier_validation/models/tier_validation.py index 29896f80..65e23716 100644 --- a/base_tier_validation/models/tier_validation.py +++ b/base_tier_validation/models/tier_validation.py @@ -629,7 +629,11 @@ def validate_tier(self): ) if self.has_comment: user_reviews = reviews.filtered( - lambda r: r.status == "pending" and (self.env.user in r.reviewer_ids) + lambda r: ( + r.status == "pending" + or (r.approve_sequence_bypass and r.status != "approved") + ) + and (self.env.user in r.reviewer_ids) ) return self._add_comment("validate", user_reviews) self._validate_tier(reviews) diff --git a/base_tier_validation/wizard/comment_wizard.py b/base_tier_validation/wizard/comment_wizard.py index 5c5a6c93..d87a126c 100644 --- a/base_tier_validation/wizard/comment_wizard.py +++ b/base_tier_validation/wizard/comment_wizard.py @@ -17,7 +17,10 @@ class CommentWizard(models.TransientModel): def add_comment(self): self.ensure_one() rec = self.env[self.res_model].browse(self.res_id) - self.review_ids.write({"comment": self.comment}) + # Write only comment on last review and not on all + self.review_ids.sorted(lambda x: x.sequence)[-1].write( + {"comment": self.comment} + ) if self.validate_reject == "validate": rec._validate_tier(self.review_ids) if self.validate_reject == "reject":