Skip to content

[19.0][FIX] base_tier_validation: comment support approve_sequence_bypass #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bosd wants to merge 1 commit into
base: 19.0
Choose a base branch
from
Open

[19.0][FIX] base_tier_validation: comment support approve_sequence_bypass #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base_tier_validation/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 5 additions & 1 deletion base_tier_validation/models/tier_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 4 additions & 1 deletion base_tier_validation/wizard/comment_wizard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
Loading