[MIG] base_tier_validation: Migration to 15.0

OCA · Dec 20, 2021 · a68c581 · a68c581
1 parent 8173493
commit a68c581
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 46 deletions.
diff --git 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": "14.0.2.7.0",
+    "version": "15.0.1.0.0",
     "development_status": "Mature",
     "maintainers": ["LoisRForgeFlow"],
     "category": "Tools",
@@ -20,9 +20,19 @@
         "views/res_config_settings_views.xml",
         "views/tier_definition_view.xml",
         "views/tier_review_view.xml",
-        "views/assets_backend.xml",
         "wizard/comment_wizard_view.xml",
         "templates/tier_validation_templates.xml",
     ],
-    "qweb": ["static/src/xml/systray.xml", "static/src/xml/tier_review_template.xml"],
+    "assets": {
+        "web.assets_backend": [
+            "/base_tier_validation/static/src/js/systray.js",
+            "/base_tier_validation/static/src/js/tier_review_widget.js",
+            "/base_tier_validation/static/src/scss/systray.scss",
+            "/base_tier_validation/static/src/scss/review.scss",
+        ],
+        "web.assets_qweb": [
+            "base_tier_validation/static/src/xml/systray.xml",
+            "base_tier_validation/static/src/xml/tier_review_template.xml",
+        ],
+    },
 }
diff --git a/base_tier_validation/models/tier_validation.py b/base_tier_validation/models/tier_validation.py
@@ -277,7 +277,7 @@ def _notify_accepted_reviews_body(self):
         )
         if has_comment:
             comment = has_comment.mapped("comment")[0]
-            return _("A review was accepted. (%s)" % comment)
+            return _("A review was accepted. (%s)") % comment
         return _("A review was accepted")
 
     def _add_comment(self, validate_reject, reviews):
@@ -322,9 +322,10 @@ def _notify_rejected_review_body(self):
         )
         if has_comment:
             comment = has_comment.mapped("comment")[0]
-            return _(
-                "A review was rejected by {}. ({})".format(self.env.user.name, comment)
-            )
+            return _("A review was rejected by %(user)s. (%(comment)s)") % {
+                "user": self.env.user.name,
+                "comment": comment,
+            }
         return _("A review was rejected by %s.") % (self.env.user.name)
 
     def _notify_rejected_review(self):
@@ -422,8 +423,8 @@ def _update_counter(self):
         self.review_ids._compute_can_review()
         notifications = []
         channel = "base.tier.validation"
-        notifications.append([channel, {}])
-        self.env["bus.bus"].sendmany(notifications)
+        notifications.append([self.env.user.partner_id, channel, {}])
+        self.env["bus.bus"]._sendmany(notifications)
 
     def unlink(self):
         self.mapped("review_ids").unlink()

diff --git a/base_tier_validation/static/src/xml/systray.xml b/base_tier_validation/static/src/xml/systray.xml
@@ -59,9 +59,9 @@
         </t>
     </t>
     <t t-name="tier.validation.ReviewMenu">
-        <li class="o_mail_systray_item">
+        <div class="o_mail_systray_item">
             <a
-                class="dropdown-toggle o-no-caret"
+                class="o-dropdown dropdown o-dropdown--no-caret"
                 data-toggle="dropdown"
                 data-display="static"
                 aria-expanded="false"
@@ -78,6 +78,6 @@
             >
                 <div class="o_mail_systray_dropdown_items" />
             </div>
-        </li>
+        </div>
     </t>
 </templates>
diff --git a/base_tier_validation/templates/tier_validation_templates.xml b/base_tier_validation/templates/tier_validation_templates.xml
@@ -37,15 +37,15 @@
                 <button
                         name="validate_tier"
                         string="Validate"
-                        t-attf-attrs="{'invisible': [('can_review', '=', False)]}"
+                        attrs="{'invisible': [('can_review', '=', False)]}"
                         type="object"
                         class="oe_inline oe_button btn-success"
                         icon="fa-thumbs-up"
                     />
                 <button
                         name="reject_tier"
                         string="Reject"
-                        t-attf-attrs="{'invisible': [('can_review', '=', False)]}"
+                        attrs="{'invisible': [('can_review', '=', False)]}"
                         type="object"
                         class="btn-icon btn-danger"
                         icon="fa-thumbs-down"

diff --git a/base_tier_validation/tests/common.py b/base_tier_validation/tests/common.py
@@ -6,7 +6,7 @@
 from odoo.tests import common
 
 
-class CommonTierValidation(common.SavepointCase):
+class CommonTierValidation(common.TransactionCase):
     @classmethod
     def setUpClass(cls):
         super(CommonTierValidation, cls).setUpClass()
@@ -76,4 +76,4 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         cls.loader.restore_registry()
-        super(CommonTierValidation, cls).tearDownClass()
+        return super(CommonTierValidation, cls).tearDownClass()
diff --git a/base_tier_validation/tests/test_tier_validation.py b/base_tier_validation/tests/test_tier_validation.py
@@ -157,7 +157,7 @@ def test_11_add_comment(self):
         record.invalidate_cache()
         res = record.validate_tier()
         ctx = res.get("context")
-        wizard = Form(self.env["comment.wizard"].with_context(ctx))
+        wizard = Form(self.env["comment.wizard"].with_context(**ctx))
         wizard.comment = "Test Comment"
         wiz = wizard.save()
         wiz.add_comment()
@@ -192,7 +192,7 @@ def test_11_add_comment_rejection(self):
         record.invalidate_cache()
         res = record.reject_tier()  # Rejection
         ctx = res.get("context")
-        wizard = Form(self.env["comment.wizard"].with_context(ctx))
+        wizard = Form(self.env["comment.wizard"].with_context(**ctx))
         wizard.comment = "Test Comment"
         wiz = wizard.save()
         wiz.add_comment()

diff --git a/base_tier_validation/views/assets_backend.xml b/base_tier_validation/views/assets_backend.xml
diff --git a/base_tier_validation/views/res_config_settings_views.xml b/base_tier_validation/views/res_config_settings_views.xml
@@ -6,7 +6,7 @@
         <field name="priority" eval="25" />
         <field name="inherit_id" ref="base_setup.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <xpath expr="//div[@id='business_documents']" position="inside">
+            <xpath expr="//div[@id='companies']" position="inside">
                 <div id="base_tier_validation">
                     <h2>Tier Validation</h2>
                     <div

diff --git a/base_tier_validation/views/tier_definition_view.xml b/base_tier_validation/views/tier_definition_view.xml
@@ -6,7 +6,7 @@
         <field name="name">tier.definition.tree</field>
         <field name="model">tier.definition</field>
         <field name="arch" type="xml">
-            <tree string="Tier Definition">
+            <tree>
                 <field name="model_id" />
                 <field name="name" />
                 <field name="review_type" />

diff --git a/base_tier_validation/views/tier_review_view.xml b/base_tier_validation/views/tier_review_view.xml
@@ -7,7 +7,6 @@
         <field name="model">tier.review</field>
         <field name="arch" type="xml">
             <tree
-                string="Tier Review"
                 decoration-danger="status=='rejected'"
                 decoration-success="status=='approved'"
             >