From 7bd993f8e297e16a79446c1119165d209d89829d Mon Sep 17 00:00:00 2001
From: EdgarRetes <edgar.retes24@gmail.com>
Date: Tue, 24 Sep 2024 16:30:26 -0600
Subject: [PATCH] # This is a combination of 9 commits. # This is the 1st
 commit message:

git commit -m "[MIG] mgmtsystem_nonconformity: Migration to 17.0"
---
 mgmtsystem_nonconformity/__manifest__.py      |   6 +-
 .../data/mail_message_subtype.xml             |   1 -
 .../data/mgmtsystem_nonconformity_cause.xml   |   1 -
 .../data/mgmtsystem_nonconformity_origin.xml  |   1 -
 .../mgmtsystem_nonconformity_severity.xml     |   1 -
 .../data/mgmtsystem_nonconformity_stage.xml   |   1 -
 mgmtsystem_nonconformity/data/sequence.xml    |   1 -
 .../demo/mgmtsystem_nonconformity.xml         |   1 -
 .../demo/mgmtsystem_nonconformity_cause.xml   |   1 -
 .../demo/mgmtsystem_nonconformity_origin.xml  |   1 -
 .../models/mgmtsystem_nonconformity.py        |   8 +-
 .../models/mgmtsystem_nonconformity_cause.py  |  13 +-
 .../models/mgmtsystem_nonconformity_origin.py |  11 +-
 .../mgmtsystem_nonconformity_report.xml       |   1 -
 .../mgmtsystem_nonconformity_security.xml     |   1 -
 .../chatter_topbar/chatter_topbar.esm.js      |   4 +-
 .../chatter_topbar/chatter_topbar.xml         |   2 -
 mgmtsystem_nonconformity/tests/test_cause.py  |  27 ++--
 mgmtsystem_nonconformity/tests/test_origin.py |  23 +--
 .../views/mgmtsystem_action.xml               |   4 +-
 .../views/mgmtsystem_cause.xml                |   1 -
 .../views/mgmtsystem_nonconformity.xml        | 149 ++++++++----------
 .../views/mgmtsystem_nonconformity_stage.xml  |   1 -
 .../views/mgmtsystem_origin.xml               |   3 +-
 .../views/mgmtsystem_severity.xml             |   1 -
 25 files changed, 122 insertions(+), 142 deletions(-)

diff --git a/mgmtsystem_nonconformity/__manifest__.py b/mgmtsystem_nonconformity/__manifest__.py
index e46a3560dba5..77a8ab91b884 100644
--- a/mgmtsystem_nonconformity/__manifest__.py
+++ b/mgmtsystem_nonconformity/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Management System - Nonconformity",
-    "version": "16.0.1.2.0",
+    "version": "17.0.1.0.0",
     "author": "Savoir-faire Linux, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/management-system",
     "license": "AGPL-3",
@@ -32,8 +32,8 @@
     ],
     "assets": {
         "web.assets_backend": [
-            "mgmtsystem_nonconformity/static/src/**/*.xml",
-            "mgmtsystem_nonconformity/static/src/**/*.js",
+            # "mgmtsystem_nonconformity/static/src/**/*.xml",
+            # "mgmtsystem_nonconformity/static/src/**/*.js",
         ],
     },
     "installable": True,
diff --git a/mgmtsystem_nonconformity/data/mail_message_subtype.xml b/mgmtsystem_nonconformity/data/mail_message_subtype.xml
index 0cf8ef31d2e2..77e16e7824bd 100644
--- a/mgmtsystem_nonconformity/data/mail_message_subtype.xml
+++ b/mgmtsystem_nonconformity/data/mail_message_subtype.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
 
     <!-- Not used at the moment. To use them override the _track_subtype method -->
diff --git a/mgmtsystem_nonconformity/data/mgmtsystem_nonconformity_cause.xml b/mgmtsystem_nonconformity/data/mgmtsystem_nonconformity_cause.xml
index 868adf677460..f79407fb8bd3 100644
--- a/mgmtsystem_nonconformity/data/mgmtsystem_nonconformity_cause.xml
+++ b/mgmtsystem_nonconformity/data/mgmtsystem_nonconformity_cause.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
 
     <record id="badly_defined_need" model="mgmtsystem.nonconformity.cause">
diff --git a/mgmtsystem_nonconformity/data/mgmtsystem_nonconformity_origin.xml b/mgmtsystem_nonconformity/data/mgmtsystem_nonconformity_origin.xml
index da0cf326ab03..89e282ef0f5a 100644
--- a/mgmtsystem_nonconformity/data/mgmtsystem_nonconformity_origin.xml
+++ b/mgmtsystem_nonconformity/data/mgmtsystem_nonconformity_origin.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
 
     <record id="nc_origin_qc" model="mgmtsystem.nonconformity.origin">
diff --git a/mgmtsystem_nonconformity/data/mgmtsystem_nonconformity_severity.xml b/mgmtsystem_nonconformity/data/mgmtsystem_nonconformity_severity.xml
index e8f115b0ce57..a76d9992733c 100644
--- a/mgmtsystem_nonconformity/data/mgmtsystem_nonconformity_severity.xml
+++ b/mgmtsystem_nonconformity/data/mgmtsystem_nonconformity_severity.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
 
     <record id="nonconformity_severity_maj" model="mgmtsystem.nonconformity.severity">
diff --git a/mgmtsystem_nonconformity/data/mgmtsystem_nonconformity_stage.xml b/mgmtsystem_nonconformity/data/mgmtsystem_nonconformity_stage.xml
index 7ef540a067f8..ad4aaf8bb3f4 100644
--- a/mgmtsystem_nonconformity/data/mgmtsystem_nonconformity_stage.xml
+++ b/mgmtsystem_nonconformity/data/mgmtsystem_nonconformity_stage.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
   <record id="stage_draft" model="mgmtsystem.nonconformity.stage">
     <field name="name">Draft</field>
diff --git a/mgmtsystem_nonconformity/data/sequence.xml b/mgmtsystem_nonconformity/data/sequence.xml
index efbe6c71c1ea..f0011e761267 100644
--- a/mgmtsystem_nonconformity/data/sequence.xml
+++ b/mgmtsystem_nonconformity/data/sequence.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
 
     <record id="seq_mgmtsystem_nonconformity" model="ir.sequence">
diff --git a/mgmtsystem_nonconformity/demo/mgmtsystem_nonconformity.xml b/mgmtsystem_nonconformity/demo/mgmtsystem_nonconformity.xml
index 1687253ba242..d604b812d241 100644
--- a/mgmtsystem_nonconformity/demo/mgmtsystem_nonconformity.xml
+++ b/mgmtsystem_nonconformity/demo/mgmtsystem_nonconformity.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="demo_nonconformity" model="mgmtsystem.nonconformity">
diff --git a/mgmtsystem_nonconformity/demo/mgmtsystem_nonconformity_cause.xml b/mgmtsystem_nonconformity/demo/mgmtsystem_nonconformity_cause.xml
index 736e50cab210..983cfd46acb6 100644
--- a/mgmtsystem_nonconformity/demo/mgmtsystem_nonconformity_cause.xml
+++ b/mgmtsystem_nonconformity/demo/mgmtsystem_nonconformity_cause.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
 
     <record id="demo_cause" model="mgmtsystem.nonconformity.cause">
diff --git a/mgmtsystem_nonconformity/demo/mgmtsystem_nonconformity_origin.xml b/mgmtsystem_nonconformity/demo/mgmtsystem_nonconformity_origin.xml
index 138a6239dd7a..8d8acba3ecff 100644
--- a/mgmtsystem_nonconformity/demo/mgmtsystem_nonconformity_origin.xml
+++ b/mgmtsystem_nonconformity/demo/mgmtsystem_nonconformity_origin.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
 
     <record id="demo_origin" model="mgmtsystem.nonconformity.origin">
diff --git a/mgmtsystem_nonconformity/models/mgmtsystem_nonconformity.py b/mgmtsystem_nonconformity/models/mgmtsystem_nonconformity.py
index 7f313c19a040..2de5a8c8c726 100644
--- a/mgmtsystem_nonconformity/models/mgmtsystem_nonconformity.py
+++ b/mgmtsystem_nonconformity/models/mgmtsystem_nonconformity.py
@@ -143,10 +143,12 @@ def _stage_groups(self, stages, domain, order):
 
     @api.model
     def _default_reference(self):
-        if self.env.context.get("active_model") and self.env.context.get("active_id"):
+        if self.env.context.get("mgmtsystem_nonconformity") and self.env.context.get(
+            "id"
+        ):
             return (
-                self.env[self.env.context["active_model"]]
-                .browse(self.env.context.get("active_id"))
+                self.env[self.env.context["mgmtsystem_nonconformity"]]
+                .browse(self.env.context.get("id"))
                 .exists()
                 .display_name
             )
diff --git a/mgmtsystem_nonconformity/models/mgmtsystem_nonconformity_cause.py b/mgmtsystem_nonconformity/models/mgmtsystem_nonconformity_cause.py
index 304ea2bbd0fd..fa260d1c6bfd 100644
--- a/mgmtsystem_nonconformity/models/mgmtsystem_nonconformity_cause.py
+++ b/mgmtsystem_nonconformity/models/mgmtsystem_nonconformity_cause.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class MgmtsystemNonconformityCause(models.Model):
@@ -24,13 +24,12 @@ class MgmtsystemNonconformityCause(models.Model):
         "mgmtsystem.nonconformity.cause", "parent_id", "Child Causes"
     )
     ref_code = fields.Char("Reference Code")
+    display_name = fields.Char(compute="_compute_display_name", recursive=True)
 
-    def name_get(self):
-        res = []
+    @api.depends("name", "parent_id.display_name")
+    def _compute_display_name(self):
         for obj in self:
             if obj.parent_id:
-                name = obj.parent_id.name_get()[0][1] + " / " + obj.name
+                obj.display_name = f"{obj.parent_id.display_name} / {obj.name}"
             else:
-                name = obj.name
-            res.append((obj.id, name))
-        return res
+                obj.display_name = obj.name
diff --git a/mgmtsystem_nonconformity/models/mgmtsystem_nonconformity_origin.py b/mgmtsystem_nonconformity/models/mgmtsystem_nonconformity_origin.py
index 1f75816a846c..97ef27ef32ca 100644
--- a/mgmtsystem_nonconformity/models/mgmtsystem_nonconformity_origin.py
+++ b/mgmtsystem_nonconformity/models/mgmtsystem_nonconformity_origin.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class MgmtsystemNonconformityOrigin(models.Model):
@@ -24,11 +24,10 @@ class MgmtsystemNonconformityOrigin(models.Model):
 
     active = fields.Boolean(default=True)
 
-    def name_get(self):
-        res = []
+    @api.depends("name", "parent_id.name")
+    def _compute_display_name(self):
         for obj in self:
             name = obj.name
             if obj.parent_id:
-                name = obj.parent_id.name_get()[0][1] + " / " + name
-            res.append((obj.id, name))
-        return res
+                name = f"{obj.parent_id.display_name} / {name}"
+            obj.display_name = name
diff --git a/mgmtsystem_nonconformity/reports/mgmtsystem_nonconformity_report.xml b/mgmtsystem_nonconformity/reports/mgmtsystem_nonconformity_report.xml
index a9785d968e61..8965d107807b 100644
--- a/mgmtsystem_nonconformity/reports/mgmtsystem_nonconformity_report.xml
+++ b/mgmtsystem_nonconformity/reports/mgmtsystem_nonconformity_report.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
         <!-- Management System Non Conformity Report Pivot View -->
diff --git a/mgmtsystem_nonconformity/security/mgmtsystem_nonconformity_security.xml b/mgmtsystem_nonconformity/security/mgmtsystem_nonconformity_security.xml
index 82aa51b7e3b4..34a3d0f4d371 100644
--- a/mgmtsystem_nonconformity/security/mgmtsystem_nonconformity_security.xml
+++ b/mgmtsystem_nonconformity/security/mgmtsystem_nonconformity_security.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
 
     <!-- Rule -->
diff --git a/mgmtsystem_nonconformity/static/src/components/chatter_topbar/chatter_topbar.esm.js b/mgmtsystem_nonconformity/static/src/components/chatter_topbar/chatter_topbar.esm.js
index 81e71164e171..0e925daafc13 100644
--- a/mgmtsystem_nonconformity/static/src/components/chatter_topbar/chatter_topbar.esm.js
+++ b/mgmtsystem_nonconformity/static/src/components/chatter_topbar/chatter_topbar.esm.js
@@ -16,8 +16,8 @@ registerPatch({
                 "mgmtsystem_nonconformity.open_mgmtsystem_nonconformity_thread_list",
                 {
                     additionalContext: {
-                        active_id: this.thread.id,
-                        active_model: this.thread.model,
+                        id: this.thread.id,
+                        mgmtsystem_nonconformity: this.thread.model,
                     },
                 }
             );
diff --git a/mgmtsystem_nonconformity/static/src/components/chatter_topbar/chatter_topbar.xml b/mgmtsystem_nonconformity/static/src/components/chatter_topbar/chatter_topbar.xml
index e5a1ac2866ea..6ffc9899a2e3 100644
--- a/mgmtsystem_nonconformity/static/src/components/chatter_topbar/chatter_topbar.xml
+++ b/mgmtsystem_nonconformity/static/src/components/chatter_topbar/chatter_topbar.xml
@@ -1,11 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <templates xml:space="preserve">
 
     <t
         t-name="mgmtsystem_nonconformity.ChatterTopbar"
         t-inherit="mail.ChatterTopbar"
         t-inherit-mode="extension"
-        owl="1"
     >
         <xpath
             expr="//button[hasclass('o_ChatterTopbar_buttonToggleAttachments')]"
diff --git a/mgmtsystem_nonconformity/tests/test_cause.py b/mgmtsystem_nonconformity/tests/test_cause.py
index 33de43c09f07..8349bc72d325 100644
--- a/mgmtsystem_nonconformity/tests/test_cause.py
+++ b/mgmtsystem_nonconformity/tests/test_cause.py
@@ -23,18 +23,21 @@ def test_create_cause(self):
         self.assertNotEqual(self.record.id, 0)
         self.assertNotEqual(self.record.id, None)
 
-    def test_name_get(self):
-        name_assoc = self.record.name_get()
-        self.assertEqual(name_assoc[0][1], "TestCause")
-        self.assertEqual(name_assoc[0][0], self.record.id)
-
-        name_assoc = self.record2.name_get()
-        self.assertEqual(name_assoc[0][1], "TestCause / test2")
-        self.assertEqual(name_assoc[0][0], self.record2.id)
-
-        name_assoc = self.record3.name_get()
-        self.assertEqual(name_assoc[0][1], "TestCause / test2 / test3")
-        self.assertEqual(name_assoc[0][0], self.record3.id)
+    def test_display_name(self):
+        name_assoc = self.record
+        name_assoc._compute_display_name()
+        self.assertEqual(name_assoc.display_name, "TestCause")
+        self.assertEqual(name_assoc.id, self.record.id)
+
+        name_assoc = self.record2
+        name_assoc._compute_display_name()
+        self.assertEqual(name_assoc.display_name, "TestCause / test2")
+        self.assertEqual(name_assoc.id, self.record2.id)
+
+        name_assoc = self.record3
+        name_assoc._compute_display_name()
+        self.assertEqual(name_assoc.display_name, "TestCause / test2 / test3")
+        self.assertEqual(name_assoc.id, self.record3.id)
 
     def test_recursion(self):
         parent = self.env["mgmtsystem.nonconformity.cause"].create(
diff --git a/mgmtsystem_nonconformity/tests/test_origin.py b/mgmtsystem_nonconformity/tests/test_origin.py
index 0db56bbfc5c0..cff12f9d1e84 100644
--- a/mgmtsystem_nonconformity/tests/test_origin.py
+++ b/mgmtsystem_nonconformity/tests/test_origin.py
@@ -22,15 +22,18 @@ def test_create_origin(self):
         self.assertNotEqual(self.record.id, 0)
         self.assertNotEqual(self.record.id, None)
 
-    def test_name_get(self):
-        name_assoc = self.record.name_get()
-        self.assertEqual(name_assoc[0][1], "TestOrigin")
-        self.assertEqual(name_assoc[0][0], self.record.id)
+    def test_display_name(self):
+        name_assoc = self.record
+        name_assoc._compute_display_name()
+        self.assertEqual(name_assoc.display_name, "TestOrigin")
+        self.assertEqual(name_assoc.id, self.record.id)
 
-        name_assoc = self.record2.name_get()
-        self.assertEqual(name_assoc[0][1], "TestOrigin / test2")
-        self.assertEqual(name_assoc[0][0], self.record2.id)
+        name_assoc = self.record2
+        name_assoc._compute_display_name()
+        self.assertEqual(name_assoc.display_name, "TestOrigin / test2")
+        self.assertEqual(name_assoc.id, self.record2.id)
 
-        name_assoc = self.record3.name_get()
-        self.assertEqual(name_assoc[0][1], "TestOrigin / test2 / test3")
-        self.assertEqual(name_assoc[0][0], self.record3.id)
+        name_assoc = self.record3
+        name_assoc._compute_display_name()
+        self.assertEqual(name_assoc.display_name, "TestOrigin / test2 / test3")
+        self.assertEqual(name_assoc.id, self.record3.id)
diff --git a/mgmtsystem_nonconformity/views/mgmtsystem_action.xml b/mgmtsystem_nonconformity/views/mgmtsystem_action.xml
index 730f73e154da..bb00f6944d1e 100644
--- a/mgmtsystem_nonconformity/views/mgmtsystem_action.xml
+++ b/mgmtsystem_nonconformity/views/mgmtsystem_action.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <!-- Actions: add link to NCs -->
@@ -14,7 +13,8 @@
                     name="nonconformity_ids"
                     colspan="4"
                     nolabel="1"
-                    attrs="{'invisible':[('nonconformity_ids','=',False)]}"
+                    invisible="nonconformity_ids == False"
+                    readonly="1"
                 />
         </field>
 
diff --git a/mgmtsystem_nonconformity/views/mgmtsystem_cause.xml b/mgmtsystem_nonconformity/views/mgmtsystem_cause.xml
index 65172f18efdb..45d4684431ff 100644
--- a/mgmtsystem_nonconformity/views/mgmtsystem_cause.xml
+++ b/mgmtsystem_nonconformity/views/mgmtsystem_cause.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <!-- Cause -->
 
diff --git a/mgmtsystem_nonconformity/views/mgmtsystem_nonconformity.xml b/mgmtsystem_nonconformity/views/mgmtsystem_nonconformity.xml
index 70eaa224627d..41de3d43a70e 100644
--- a/mgmtsystem_nonconformity/views/mgmtsystem_nonconformity.xml
+++ b/mgmtsystem_nonconformity/views/mgmtsystem_nonconformity.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <menuitem
@@ -170,9 +169,11 @@
                             </div>
                             <div class="oe_kanban_content">
                                 <div>
-                                    <strong><field name="ref" /> - <field
-                                            name="name"
-                                        /></strong>
+                                    <strong>
+                                        <field name="ref" />
+                                        -
+                                        <field name="name" />
+                                    </strong>
                                 </div>
                                 <div>
                                     <br />
@@ -181,9 +182,12 @@
                                     <span
                                         class='oe_kanban_mail_new'
                                         title='Unread Messages'
-                                    ><i class='fa fa-comments' /><t
-                                            t-raw="record.message_needaction_counter.raw_value"
-                                        /></span>
+                                    >
+                                        <i class='fa fa-comments' />
+                                        <t
+                                            t-esc="record.message_needaction_counter.raw_value"
+                                        />
+                                    </span>
                                 </div>
                                 <div class="oe_kanban_bottom_right">
                                     <field
@@ -221,45 +225,33 @@
                     <field name="kanban_state" widget="kanban_state_selection" />
                     <group name="main">
                         <group name="config">
-                            <field
-                                name="name"
-                                attrs="{'readonly':[('state','not in',['draft'])]}"
-                            />
-                            <field
-                                name="ref"
-                                attrs="{'readonly':[('state','not in',['draft'])]}"
-                            />
+                            <field name="name" readonly="state not in 'draft'" />
+                            <field name="ref" readonly="state not in 'draft'" />
                             <field name="create_date" readonly="1" />
                             <field
                                 name="partner_id"
-                                attrs="{'readonly':[('state','not in',['draft','analysis'])]}"
-                            />
-                            <field
-                                name="reference"
-                                attrs="{'readonly':[('state','not in',['draft'])]}"
+                                readonly="state not in 'draft' and state not in 'analysis'"
                             />
+                            <field name="reference" readonly="state not in 'draft'" />
                             <field
                                 name="origin_ids"
                                 widget="many2many_tags"
-                                attrs="{'readonly':[('state','not in',['draft','analysis'])]}"
+                                readonly="state not in 'draft' and state not in 'analysis'"
                             />
                         </group>
                         <group name="meta">
                             <field
                                 name="responsible_user_id"
-                                attrs="{'readonly':[('state','not in',['draft','analysis'])]}"
+                                readonly="state not in 'draft' and state not in 'analysis'"
                             />
                             <field
                                 name="manager_user_id"
-                                attrs="{'readonly':[('state','not in',['draft','analysis'])]}"
-                            />
-                            <field
-                                name="user_id"
-                                attrs="{'readonly':[('state','not in',['draft'])]}"
+                                readonly="state not in 'draft' and state not in 'analysis'"
                             />
+                            <field name="user_id" readonly="state not in 'draft'" />
                             <field
                                 name="system_id"
-                                attrs="{'readonly':[('state','not in',['draft','analysis'])]}"
+                                readonly="state not in 'draft' and state not in 'analysis'"
                             />
                             <field
                                 name="company_id"
@@ -274,13 +266,13 @@
                             <field
                                 name="description"
                                 placeholder="Add a description ..."
-                                attrs="{'readonly':[('state','not in',['draft','analysis'])]}"
+                                readonly="state not in 'draft' and state not in 'analysis'"
                             />
                             <group name="state">
                                 <field
                                     name="immediate_action_id"
                                     domain="[('type_action','=','immediate')]"
-                                    attrs="{'readonly':[('state','not in',['draft', 'analysis'])]}"
+                                    readonly="state not in 'draft' and state not in 'analysis'"
                                 />
                             </group>
                         </page>
@@ -288,100 +280,97 @@
                         <page string="Procedures" name="procedures">
                             <field
                                 name="procedure_ids"
-                                attrs="{'readonly':[('state','not in',['draft','analysis'])]}"
+                                readonly="state not in 'draft' and state not in 'analysis'"
                                 domain="[('parent_id','in',('Procedure','Environmental Aspect','Manuals'))]"
                             />
                         </page>
 
                         <page
                             string="Causes and Analysis"
-                            attrs="{'invisible':[('state','in',['draft','cancel'])]}"
+                            invisible="state not in 'draft' and state not in 'cancel'"
                             name="causes_analysis"
                         >
                             <separator string="Analysis" />
-                            <field
-                                name="analysis"
-                                attrs="{'readonly':[('state','not in',['analysis'])]}"
-                            />
+                            <field name="analysis" readonly="state not in 'analysis'" />
 
                             <separator string="Causes" />
                             <field
                                 name="cause_ids"
-                                attrs="{'readonly':[('state','not in',['analysis'])]}"
+                                readonly="state not in 'analysis'"
                                 options="{'no_create': True}"
                             >
-                            <tree create="1" delete="1" decoration-info="parent_id">
-                                <field name="parent_id" />
-                                <field name="name" />
-                                <field name="description" />
-                                <field name="sequence" />
-                            </tree>
-                        </field>
+                                <tree create="1" delete="1" decoration-info="parent_id">
+                                    <field name="parent_id" />
+                                    <field name="name" />
+                                    <field name="description" />
+                                    <field name="sequence" />
+                                </tree>
+                            </field>
 
-                        <separator string="Analysis Confirmation" />
-                        <group>
+                            <separator string="Analysis Confirmation" />
                             <group>
-                                <field
+                                <group>
+                                    <field
                                         name="severity_id"
-                                        attrs="{'readonly':[('state','not in',['analysis'])]}"
+                                        readonly="state not in 'analysis'"
                                     />
+                                </group>
                             </group>
-                        </group>
-                    </page>
+                        </page>
 
-                    <page
+                        <page
                             string="Actions"
-                            attrs="{'invisible':[('state','in',['draft','analysis','cancel'])]}"
+                            invisible="state not in 'draft' and state not in 'analysis' and state not in 'cancel'"
                             name="actions"
                         >
-                        <separator string="Action Plan" />
-                        <field
+                            <separator string="Action Plan" />
+                            <field
                                 name="action_ids"
-                                attrs="{'readonly':[('state','not in',['pending'])]}"
+                                readonly="state not in 'pending'"
                             />
 
-                        <group string="Plan Review">
-                            <group>
-                                <field
+                            <group string="Plan Review">
+                                <group>
+                                    <field
                                         name="action_comments"
-                                        attrs="{'readonly':[('state','not in',['pending'])]}"
+                                        readonly="state not in 'pending'"
                                         nolabel="1"
                                         placeholder="Action Plan Comments"
                                     />
+                                </group>
                             </group>
-                        </group>
 
-                        <group
-                                attrs="{'invisible':[('state','not in',['open','done'])]}"
+                            <group
+                                invisible="state not in 'open' and state not in 'done'"
                                 string="Effectiveness Review"
                             >
-                            <group>
-                                <field
+                                <group>
+                                    <field
                                         name="evaluation_comments"
-                                        attrs="{'readonly':[('state','not in',['open'])]}"
+                                        readonly="state not in 'open' and state not in 'done'"
                                         nolabel="1"
                                         placeholder="Evaluation Comments"
                                     />
+                                </group>
                             </group>
-                        </group>
-                    </page>
+                        </page>
 
-                </notebook>
-            </sheet>
+                    </notebook>
+                </sheet>
 
-            <div class="oe_chatter">
-                <field
+                <div class="oe_chatter">
+                    <field
                         name="message_follower_ids"
                         widget="mail_followers"
                         groups="base.group_user"
                     />
-                <field name="activity_ids" widget="mail_activity" />
-                <field name="message_ids" widget="mail_thread" />
-            </div>
+                    <field name="activity_ids" widget="mail_activity" />
+                    <field name="message_ids" widget="mail_thread" />
+                </div>
 
-        </form>
-    </field>
-</record>
+            </form>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="open_mgmtsystem_nonconformity_list">
         <field name="name">Nonconformities</field>
@@ -401,12 +390,14 @@
         <field name="view_mode">kanban,tree,form</field>
         <field
             name="domain"
-        >[('res_id', '=', active_id), ('res_model', '=', active_model)]</field>
+        >[('res_id', '=', id), ('res_model', '=', mgmtsystem_nonconformity)]
+        </field>
         <field name="view_id" ref="view_mgmtsystem_nonconformity_kanban" />
         <field name="search_view_id" ref="view_mgmtsystem_nonconformity_filter" />
         <field
             name="context"
-        >{"search_default_user_id":uid, "default_res_model": active_model, "default_res_id": active_id}</field>
+        >{"search_default_user_id":uid, "default_res_model": mgmtsystem_nonconformity, "default_res_id": id}
+        </field>
     </record>
 
     <menuitem
diff --git a/mgmtsystem_nonconformity/views/mgmtsystem_nonconformity_stage.xml b/mgmtsystem_nonconformity/views/mgmtsystem_nonconformity_stage.xml
index 3ee4977b9e2f..3e9656a88b85 100644
--- a/mgmtsystem_nonconformity/views/mgmtsystem_nonconformity_stage.xml
+++ b/mgmtsystem_nonconformity/views/mgmtsystem_nonconformity_stage.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record model="ir.ui.view" id="mgmtsystem_nonconformity_stage_tree_view">
diff --git a/mgmtsystem_nonconformity/views/mgmtsystem_origin.xml b/mgmtsystem_nonconformity/views/mgmtsystem_origin.xml
index 82eb86a212b3..54e9a2731d1d 100644
--- a/mgmtsystem_nonconformity/views/mgmtsystem_origin.xml
+++ b/mgmtsystem_nonconformity/views/mgmtsystem_origin.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <!-- Origin -->
@@ -15,7 +14,7 @@
                         name="web_ribbon"
                         title="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active"
                     />
             <group>
               <field name="name" />
diff --git a/mgmtsystem_nonconformity/views/mgmtsystem_severity.xml b/mgmtsystem_nonconformity/views/mgmtsystem_severity.xml
index 5b67e5c25a83..b828978c5a98 100644
--- a/mgmtsystem_nonconformity/views/mgmtsystem_severity.xml
+++ b/mgmtsystem_nonconformity/views/mgmtsystem_severity.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <!-- Severity -->