Skip to content

Commit 740df60

Browse files
ChrisOForgeFlowAlexPForgeFlow
authored andcommitted
[16.0][MIG] base_tier_validation_correction
1 parent a3c5505 commit 740df60

File tree

5 files changed

+39
-32
lines changed

5 files changed

+39
-32
lines changed

base_tier_validation_correction/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "Base Tier Validation Correction",
55
"summary": "Correct tier.review data after it has been created.",
6-
"version": "14.0.1.0.1",
6+
"version": "16.0.1.0.0",
77
"category": "Tools",
88
"website": "https://github.com/OCA/server-ux",
99
"author": "Ecosoft,Odoo Community Association (OCA)",

base_tier_validation_correction/models/tier_correction.py

+17-8
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ class TierCorrection(models.Model):
3838
selection=[
3939
("reviewer", "Reassign Reviewer(s)"),
4040
],
41-
string="Correction Type",
4241
default="reviewer",
4342
required=True,
4443
readonly=True,
@@ -274,15 +273,25 @@ def _notify_reviewer_change(self, ttype="correct"):
274273
reviewers = ", ".join(
275274
tier_reviews.reviewer_ids.filtered("name").mapped("name")
276275
)
277-
message = _("The Correction '%s', corrrected reviewers on '%s' to '%s'") % (
278-
self.correction_id.name,
279-
reviews,
280-
reviewers,
281-
)
276+
message = _(
277+
"The Correction '%(name)s', "
278+
"corrrected reviewers "
279+
"on '%(reviews)s' to '%(reviewers)s'"
280+
) % {
281+
"name": self.correction_id.name,
282+
"reviews": reviews,
283+
"reviewers": reviewers,
284+
}
282285
if ttype == "revert":
283286
message = _(
284-
"The Correction '%s', reverted reviewers on '%s' back to '%s'"
285-
) % (self.correction_id.name, reviews, reviewers)
287+
"The Correction '%(name)s', "
288+
"reverted reviewers on '%(reviews)s' "
289+
"back to '%(reviewers)s'"
290+
) % {
291+
"name": self.correction_id.name,
292+
"reviews": reviews,
293+
"reviewers": reviewers,
294+
}
286295
getattr(self.resource_ref.sudo(), post)(
287296
subtype_xmlid=(
288297
"base_tier_validation_correction.mt_tier_validation_correction"
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
<odoo>
3-
<data noupdate="0">
2+
<odoo noupdate="0">
43

54
<record id="group_tier_correction" model="res.groups">
65
<field name="name">Tier Review Correction</field>
76
<field name="category_id" ref="base.module_category_hidden" />
87
<field
9-
name="users"
10-
eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
11-
/>
8+
name="users"
9+
eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
10+
/>
1211
</record>
1312

14-
</data>
1513
</odoo>

base_tier_validation_correction/tests/test_tier_validation.py

+16-16
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
class TierTierValidation(CommonTierValidation):
1414
def test_01_tier_correction(self):
1515
"""With the document in validation,
16-
- User click on Change Reivewer to creat new correction
16+
- User click on Change Reviewer to creat new correction
1717
- Change the reviewer to user 2, test that user 2 need_validation
1818
- Revert to user 1, test that now user 1 need validation
1919
- Click on Change Review link from the document again, then view the corrections
@@ -24,11 +24,11 @@ def test_01_tier_correction(self):
2424
self.assertFalse(doc_user2.can_review)
2525
# User 1, is the reviewer as specified in the tier.definition
2626
doc_user1 = self.test_record.with_user(self.test_user_1.id)
27-
doc_user1.invalidate_cache()
27+
doc_user1.invalidate_recordset()
2828
self.assertTrue(doc_user1.can_review)
2929
# Change Reviewer from user 1 -> user 2
3030
ctx = {"active_id": doc_user1.id, "active_model": doc_user1._name}
31-
res = doc_user1.with_context(ctx).view_tier_correction()
31+
res = doc_user1.with_context(**ctx).view_tier_correction()
3232
self.assertFalse(res["domain"]) # No existing correction, create new
3333
correction = self.env["tier.correction"].create(
3434
{
@@ -66,23 +66,23 @@ def test_01_tier_correction(self):
6666
self.assertTrue(reviews)
6767
# Make correction, now user 2 can review
6868
correction.action_done()
69-
doc_user2.invalidate_cache()
69+
doc_user2.invalidate_recordset()
7070
self.assertTrue(doc_user2.can_review)
71-
doc_user1.invalidate_cache()
71+
doc_user1.invalidate_recordset()
7272
self.assertFalse(doc_user1.can_review)
73-
# Make reversion, now user 1 can reivew
73+
# Make reversion, now user 1 can review
7474
correction.action_revert()
75-
doc_user1.invalidate_cache()
75+
doc_user1.invalidate_recordset()
7676
self.assertTrue(doc_user1.can_review)
77-
doc_user2.invalidate_cache()
77+
doc_user2.invalidate_recordset()
7878
self.assertFalse(doc_user2.can_review)
7979
# From the document, view tier correction once again
80-
res = doc_user1.with_context(ctx).view_tier_correction()
80+
res = doc_user1.with_context(**ctx).view_tier_correction()
8181
self.assertEqual(res["domain"][0][2], [correction.id])
8282

8383
def test_01_tier_correction_by_scheduler(self):
8484
"""With the document in validation,
85-
- User click on Change Reivewer to creat new correction
85+
- User click on Change Reviewer to creat new correction
8686
- Setup Scheduled Correction Date and Scheduled Revert, test date constraints
8787
- Run scheduler which change reviewer to user 2, test user 2 need_validation
8888
- Run scheduler which revert to user 1, test user 1 need validation
@@ -93,11 +93,11 @@ def test_01_tier_correction_by_scheduler(self):
9393
self.assertFalse(doc_user2.can_review)
9494
# User 1, is the reviewer as specified in the tier.definition
9595
doc_user1 = self.test_record.with_user(self.test_user_1.id)
96-
doc_user1.invalidate_cache()
96+
doc_user1.invalidate_recordset()
9797
self.assertTrue(doc_user1.can_review)
9898
# Change Reviewer from user 1 -> user 2
9999
ctx = {"active_id": doc_user1.id, "active_model": doc_user1._name}
100-
res = doc_user1.with_context(ctx).view_tier_correction()
100+
res = doc_user1.with_context(**ctx).view_tier_correction()
101101
self.assertFalse(res["domain"]) # No existing correction, create new
102102
correction = self.env["tier.correction"].create(
103103
{
@@ -116,9 +116,9 @@ def test_01_tier_correction_by_scheduler(self):
116116
correction.action_prepare()
117117
self.assertEqual(correction.state, "prepare")
118118
scheduler.method_direct_trigger()
119-
doc_user2.invalidate_cache()
119+
doc_user2.invalidate_recordset()
120120
self.assertTrue(doc_user2.can_review)
121-
doc_user1.invalidate_cache()
121+
doc_user1.invalidate_recordset()
122122
self.assertFalse(doc_user1.can_review)
123123
# Run Schedulder, to revert
124124
with self.assertRaises(ValidationError):
@@ -129,7 +129,7 @@ def test_01_tier_correction_by_scheduler(self):
129129
)
130130
self.assertEqual(correction.state, "done")
131131
scheduler.method_direct_trigger()
132-
doc_user2.invalidate_cache()
132+
doc_user2.invalidate_recordset()
133133
self.assertTrue(doc_user1.can_review)
134-
doc_user1.invalidate_cache()
134+
doc_user1.invalidate_recordset()
135135
self.assertFalse(doc_user2.can_review)

base_tier_validation_correction/views/tier_correction_view.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<field name="name">tier.correction.tree</field>
77
<field name="model">tier.correction</field>
88
<field name="arch" type="xml">
9-
<tree string="Tier Correction">
9+
<tree>
1010
<field name="name" />
1111
<field name="correction_type" />
1212
<field name="reference" />

0 commit comments

Comments
 (0)