From e47c65386b58d1718835acc077629acaff0441f5 Mon Sep 17 00:00:00 2001
From: Damien Carlier <damien.carlier@gmail.com>
Date: Tue, 5 Dec 2023 16:32:08 +0100
Subject: [PATCH] [MIG] attribute_set: Migration to 17.0

---
 attribute_set/__init__.py                     |  1 -
 attribute_set/__manifest__.py                 |  3 +-
 attribute_set/i18n/attribute_set.pot          | 41 --------
 attribute_set/i18n/es.po                      | 41 --------
 attribute_set/models/attribute_attribute.py   | 48 ++++------
 attribute_set/security/ir.model.access.csv    |  2 -
 attribute_set/tests/test_build_view.py        |  2 +-
 .../views/attribute_attribute_view.xml        | 91 +++++++-----------
 attribute_set/views/attribute_group_view.xml  |  5 +-
 attribute_set/views/attribute_option_view.xml |  4 +-
 attribute_set/wizard/__init__.py              |  1 -
 .../wizard/attribute_option_wizard.py         | 94 -------------------
 .../wizard/attribute_option_wizard_view.xml   | 25 -----
 test-requirements.txt                         |  1 +
 14 files changed, 61 insertions(+), 298 deletions(-)
 delete mode 100644 attribute_set/wizard/__init__.py
 delete mode 100644 attribute_set/wizard/attribute_option_wizard.py
 delete mode 100644 attribute_set/wizard/attribute_option_wizard_view.xml
 create mode 100644 test-requirements.txt

diff --git a/attribute_set/__init__.py b/attribute_set/__init__.py
index da04c4f0..af38f37e 100644
--- a/attribute_set/__init__.py
+++ b/attribute_set/__init__.py
@@ -1,3 +1,2 @@
 from . import models
-from . import wizard
 from . import utils
diff --git a/attribute_set/__manifest__.py b/attribute_set/__manifest__.py
index 1183c4b0..5b68dfb5 100644
--- a/attribute_set/__manifest__.py
+++ b/attribute_set/__manifest__.py
@@ -1,6 +1,6 @@
 {
     "name": "Attribute Set",
-    "version": "16.0.1.1.0",
+    "version": "17.0.1.0.0",
     "category": "Generic Modules/Others",
     "license": "AGPL-3",
     "author": "Akretion,Odoo Community Association (OCA)",
@@ -14,7 +14,6 @@
         "views/attribute_group_view.xml",
         "views/attribute_option_view.xml",
         "views/attribute_set_view.xml",
-        "wizard/attribute_option_wizard_view.xml",
     ],
     "external_dependencies": {"python": ["unidecode"]},
     "installable": True,
diff --git a/attribute_set/i18n/attribute_set.pot b/attribute_set/i18n/attribute_set.pot
index 04ce538a..c90d03b1 100644
--- a/attribute_set/i18n/attribute_set.pot
+++ b/attribute_set/i18n/attribute_set.pot
@@ -119,11 +119,6 @@ msgstr ""
 msgid "Can't change the type of an attribute. Please create a new one."
 msgstr ""
 
-#. module: attribute_set
-#: model_terms:ir.ui.view,arch_db:attribute_set.attribute_option_wizard_form_view
-msgid "Cancel"
-msgstr ""
-
 #. module: attribute_set
 #: model:ir.model.fields.selection,name:attribute_set.selection__attribute_attribute__attribute_type__char
 msgid "Char"
@@ -180,7 +175,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_attribute__create_uid
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_group__create_uid
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_option__create_uid
-#: model:ir.model.fields,field_description:attribute_set.field_attribute_option_wizard__create_uid
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_set__create_uid
 msgid "Created by"
 msgstr ""
@@ -193,7 +187,6 @@ msgstr ""
 #. module: attribute_set
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_group__create_date
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_option__create_date
-#: model:ir.model.fields,field_description:attribute_set.field_attribute_option_wizard__create_date
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_set__create_date
 msgid "Created on"
 msgstr ""
@@ -203,11 +196,6 @@ msgstr ""
 msgid "Custom"
 msgstr ""
 
-#. module: attribute_set
-#: model:ir.model,name:attribute_set.model_attribute_option_wizard
-msgid "Custom Attributes Option"
-msgstr ""
-
 #. module: attribute_set
 #: model:ir.model.fields.selection,name:attribute_set.selection__attribute_attribute__attribute_type__date
 msgid "Date"
@@ -235,7 +223,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_attribute__display_name
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_group__display_name
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_option__display_name
-#: model:ir.model.fields,field_description:attribute_set.field_attribute_option_wizard__display_name
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_set__display_name
 msgid "Display Name"
 msgstr ""
@@ -313,7 +300,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_attribute__id
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_group__id
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_option__id
-#: model:ir.model.fields,field_description:attribute_set.field_attribute_option_wizard__id
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_set__id
 msgid "ID"
 msgstr ""
@@ -404,7 +390,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_attribute____last_update
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_group____last_update
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_option____last_update
-#: model:ir.model.fields,field_description:attribute_set.field_attribute_option_wizard____last_update
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_set____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -413,7 +398,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_attribute__write_uid
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_group__write_uid
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_option__write_uid
-#: model:ir.model.fields,field_description:attribute_set.field_attribute_option_wizard__write_uid
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_set__write_uid
 msgid "Last Updated by"
 msgstr ""
@@ -422,7 +406,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_attribute__write_date
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_group__write_date
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_option__write_date
-#: model:ir.model.fields,field_description:attribute_set.field_attribute_option_wizard__write_date
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_set__write_date
 msgid "Last Updated on"
 msgstr ""
@@ -477,17 +460,8 @@ msgstr ""
 msgid "On delete property for many2one fields"
 msgstr ""
 
-#. module: attribute_set
-#. odoo-python
-#: code:addons/attribute_set/models/attribute_attribute.py:0
-#: model_terms:ir.ui.view,arch_db:attribute_set.attribute_option_wizard_form_view
-#, python-format
-msgid "Options Wizard"
-msgstr ""
-
 #. module: attribute_set
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_option__attribute_id
-#: model:ir.model.fields,field_description:attribute_set.field_attribute_option_wizard__attribute_id
 msgid "Product Attribute"
 msgstr ""
 
@@ -717,11 +691,6 @@ msgid ""
 "Used for custom many2many fields to define a custom relation table name"
 msgstr ""
 
-#. module: attribute_set
-#: model_terms:ir.ui.view,arch_db:attribute_set.attribute_option_wizard_form_view
-msgid "Validate"
-msgstr ""
-
 #. module: attribute_set
 #: model:ir.model.fields,help:attribute_set.field_attribute_attribute__copied
 msgid "Whether the value is copied when duplicating a record."
@@ -753,13 +722,3 @@ msgid ""
 "Specify a Python expression defining a list of triplets.\n"
 "For example : `[('color', '=', 'red')]`"
 msgstr ""
-
-#. module: attribute_set
-#: model_terms:ir.ui.view,arch_db:attribute_set.attribute_option_wizard_form_view
-msgid "options_placeholder"
-msgstr ""
-
-#. module: attribute_set
-#: model_terms:ir.ui.view,arch_db:attribute_set.attribute_option_wizard_form_view
-msgid "or"
-msgstr ""
diff --git a/attribute_set/i18n/es.po b/attribute_set/i18n/es.po
index 19770e1a..d90d41de 100644
--- a/attribute_set/i18n/es.po
+++ b/attribute_set/i18n/es.po
@@ -126,11 +126,6 @@ msgstr ""
 msgid "Can't change the type of an attribute. Please create a new one."
 msgstr "No se puede cambiar el tipo de un atributo. Por favor, cree uno nuevo."
 
-#. module: attribute_set
-#: model_terms:ir.ui.view,arch_db:attribute_set.attribute_option_wizard_form_view
-msgid "Cancel"
-msgstr "Cancelar"
-
 #. module: attribute_set
 #: model:ir.model.fields.selection,name:attribute_set.selection__attribute_attribute__attribute_type__char
 msgid "Char"
@@ -194,7 +189,6 @@ msgstr "Copiado"
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_attribute__create_uid
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_group__create_uid
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_option__create_uid
-#: model:ir.model.fields,field_description:attribute_set.field_attribute_option_wizard__create_uid
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_set__create_uid
 msgid "Created by"
 msgstr "Creado por"
@@ -207,7 +201,6 @@ msgstr "Fecha de creación"
 #. module: attribute_set
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_group__create_date
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_option__create_date
-#: model:ir.model.fields,field_description:attribute_set.field_attribute_option_wizard__create_date
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_set__create_date
 msgid "Created on"
 msgstr "Creado el"
@@ -217,11 +210,6 @@ msgstr "Creado el"
 msgid "Custom"
 msgstr "Personalizar"
 
-#. module: attribute_set
-#: model:ir.model,name:attribute_set.model_attribute_option_wizard
-msgid "Custom Attributes Option"
-msgstr "Opción Atributos personalizados"
-
 #. module: attribute_set
 #: model:ir.model.fields.selection,name:attribute_set.selection__attribute_attribute__attribute_type__date
 msgid "Date"
@@ -253,7 +241,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_attribute__display_name
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_group__display_name
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_option__display_name
-#: model:ir.model.fields,field_description:attribute_set.field_attribute_option_wizard__display_name
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_set__display_name
 msgid "Display Name"
 msgstr "Mostrar Nombre"
@@ -333,7 +320,6 @@ msgstr "Grupos"
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_attribute__id
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_group__id
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_option__id
-#: model:ir.model.fields,field_description:attribute_set.field_attribute_option_wizard__id
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_set__id
 msgid "ID"
 msgstr "ID"
@@ -455,7 +441,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_attribute____last_update
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_group____last_update
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_option____last_update
-#: model:ir.model.fields,field_description:attribute_set.field_attribute_option_wizard____last_update
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_set____last_update
 msgid "Last Modified on"
 msgstr "Última actualización el"
@@ -464,7 +449,6 @@ msgstr "Última actualización el"
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_attribute__write_uid
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_group__write_uid
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_option__write_uid
-#: model:ir.model.fields,field_description:attribute_set.field_attribute_option_wizard__write_uid
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_set__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
@@ -473,7 +457,6 @@ msgstr "Última actualización por"
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_attribute__write_date
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_group__write_date
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_option__write_date
-#: model:ir.model.fields,field_description:attribute_set.field_attribute_option_wizard__write_date
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_set__write_date
 msgid "Last Updated on"
 msgstr "Última Actualización el"
@@ -528,17 +511,8 @@ msgstr "En Eliminar"
 msgid "On delete property for many2one fields"
 msgstr "En la propiedad eliminar para campos many2one"
 
-#. module: attribute_set
-#. odoo-python
-#: code:addons/attribute_set/models/attribute_attribute.py:0
-#: model_terms:ir.ui.view,arch_db:attribute_set.attribute_option_wizard_form_view
-#, python-format
-msgid "Options Wizard"
-msgstr "Asistente para Opciones"
-
 #. module: attribute_set
 #: model:ir.model.fields,field_description:attribute_set.field_attribute_option__attribute_id
-#: model:ir.model.fields,field_description:attribute_set.field_attribute_option_wizard__attribute_id
 msgid "Product Attribute"
 msgstr "Atributo de Producto"
 
@@ -784,11 +758,6 @@ msgstr ""
 "Se utiliza en los campos many2many personalizados para definir un nombre de "
 "tabla de relación personalizado"
 
-#. module: attribute_set
-#: model_terms:ir.ui.view,arch_db:attribute_set.attribute_option_wizard_form_view
-msgid "Validate"
-msgstr "Validar"
-
 #. module: attribute_set
 #: model:ir.model.fields,help:attribute_set.field_attribute_attribute__copied
 msgid "Whether the value is copied when duplicating a record."
@@ -825,13 +794,3 @@ msgstr ""
 "`%(domain)s` es un nombre de dominio inválido.\n"
 "Especifica una expresión Python que define una lista de tripletas.\n"
 "Por ejemplo: `[('color', '=', 'red')]`"
-
-#. module: attribute_set
-#: model_terms:ir.ui.view,arch_db:attribute_set.attribute_option_wizard_form_view
-msgid "options_placeholder"
-msgstr "options_placeholder"
-
-#. module: attribute_set
-#: model_terms:ir.ui.view,arch_db:attribute_set.attribute_option_wizard_form_view
-msgid "or"
-msgstr "o"
diff --git a/attribute_set/models/attribute_attribute.py b/attribute_set/models/attribute_attribute.py
index 62b93e09..7d33fff6 100644
--- a/attribute_set/models/attribute_attribute.py
+++ b/attribute_set/models/attribute_attribute.py
@@ -10,8 +10,9 @@
 
 from lxml import etree
 
-from odoo import _, api, fields, models
+from odoo import Command, _, api, fields, models
 from odoo.exceptions import ValidationError
+from odoo.tools.safe_eval import safe_eval
 
 from ..utils.orm import setup_modifiers
 
@@ -82,6 +83,10 @@ class AttributeAttribute(models.Model):
         "ir.model", "Relational Model", ondelete="cascade"
     )
 
+    relation_model_name = fields.Char(
+        "Relational Model Name", related="relation_model_id.model"
+    )
+
     widget = fields.Char(help="Specify widget to add to the field on the views.")
 
     required_on_views = fields.Boolean(
@@ -269,22 +274,18 @@ def _onchange_domain(self):
 
     def button_add_options(self):
         self.ensure_one()
-        # Before adding another option delete the ones which are linked
-        # to a deleted object
-        for option in self.option_ids:
-            if not option.value_ref:
-                option.unlink()
-        # Then open the Options Wizard which will display an 'opt_ids' m2m field related
-        # to the 'relation_model_id' model
-        return {
-            "context": dict(self.env.context, attribute_id=self.id),
-            "name": _("Options Wizard"),
-            "view_type": "form",
-            "view_mode": "form",
-            "res_model": "attribute.option.wizard",
-            "type": "ir.actions.act_window",
-            "target": "new",
-        }
+        values = self.env[self.relation_model_id.model].search(safe_eval(self.domain))
+        options = []
+        for value in values:
+            options.append(
+                Command.create(
+                    {
+                        "name": value.display_name,
+                        "value_ref": f"{value._name},{value.id}",
+                    }
+                )
+            )
+        self.option_ids = options
 
     @api.model_create_multi
     def create(self, vals_list):
@@ -373,16 +374,6 @@ def create(self, vals_list):
             vals["state"] = "manual"
         return super().create(vals_list)
 
-    def _delete_related_option_wizard(self, option_vals):
-        """Delete related attribute's options wizards."""
-        self.ensure_one()
-        for option_change in option_vals:
-            if option_change[0] == 2:
-                self.env["attribute.option.wizard"].search(
-                    [("attribute_id", "=", self.id)]
-                ).unlink()
-                break
-
     def _delete_old_fields_options(self, options):
         """Delete outdated attribute's field values on existing records."""
         self.ensure_one()
@@ -450,9 +441,6 @@ def write(self, vals):
             if att.relation_model_id:
                 options = self.env[att.relation_model_id.model]
                 if "option_ids" in list(vals.keys()):
-                    # Delete related attribute.option.wizard if an attribute.option
-                    # has been deleted
-                    att._delete_related_option_wizard(vals["option_ids"])
                     # If there is still some attribute.option available, override
                     # 'options' with the objects they are refering to.
                     options = options.search(
diff --git a/attribute_set/security/ir.model.access.csv b/attribute_set/security/ir.model.access.csv
index c0cd4a5b..089bebf6 100644
--- a/attribute_set/security/ir.model.access.csv
+++ b/attribute_set/security/ir.model.access.csv
@@ -7,5 +7,3 @@ access_attribute_set_attribute_set_user,attribute_set_attribute_set,attribute_se
 access_attribute_set_attribute_group_user,attribute_set_attribute_group,attribute_set.model_attribute_group,base.group_user,1,0,0,0
 access_attribute_set_attribute_attribute_user,attribute_set_attribute_attribute,attribute_set.model_attribute_attribute,base.group_user,1,0,0,0
 access_attribute_set_attribute_option_user,attribute_set_attribute_option,attribute_set.model_attribute_option,base.group_user,1,0,0,0
-access_attribute_set_attribute_option_wizard_user,attribute_set_attribute_option_wizard,attribute_set.model_attribute_option_wizard,base.group_user,1,0,0,0
-access_attribute_set_attribute_option_wizard_erpmanager,attribute_set_attribute_option_wizard,attribute_set.model_attribute_option_wizard,base.group_erp_manager,1,1,1,1
diff --git a/attribute_set/tests/test_build_view.py b/attribute_set/tests/test_build_view.py
index b22f7fdc..7f9747cf 100644
--- a/attribute_set/tests/test_build_view.py
+++ b/attribute_set/tests/test_build_view.py
@@ -163,7 +163,7 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         cls.loader.restore_registry()
-        return super(BuildViewCase, cls).tearDownClass()
+        return super().tearDownClass()
 
     # TEST write on attributes
     @users("demo")
diff --git a/attribute_set/views/attribute_attribute_view.xml b/attribute_set/views/attribute_attribute_view.xml
index c1bb7042..16550293 100644
--- a/attribute_set/views/attribute_attribute_view.xml
+++ b/attribute_set/views/attribute_attribute_view.xml
@@ -7,64 +7,43 @@
             <form string="Attribute">
                 <field
                     name="nature"
-                    attrs="{'readonly': [('create_date', '!=', False)]}"
+                    readonly="create_date"
                     options="{'horizontal': true}"
                     class="oe_edit_only col-12"
                     widget="radio"
                     nolabel="1"
                     required="1"
                 />
-                <group
-                    col="2"
-                    class="col-6"
-                    invisible="context.get('default_model_id')"
-                >
+                <group col="4" colspan="4" invisible="context.get('default_model_id')">
                     <!-- The field created by this Attribute will be related to the model given
                        by 'default_model_id' through the menu's context that led to this view -->
                     <field name="model_id" />
                 </group>
-                <separator attrs="{'invisible': [('nature', '=', 'native')]}" />
-                <group
-                    col="2"
-                    class="col-6"
-                    attrs="{'invisible': [('nature', '=', 'native')]}"
-                >
-                    <field
-                        name="field_description"
-                        attrs="{'required': [('nature', '=', 'custom')]}"
-                    />
+                <separator invisible="nature == 'native'" />
+                <group col="4" colspan="4" invisible="nature == 'native'">
+                    <field name="field_description" required="nature == 'custom'" />
                     <field
                         name="name"
-                        attrs="{'readonly': [('create_date', '!=', False)], 'required': [('nature', '=', 'custom')]}"
-                    />
-                    <field
-                        name="attribute_type"
-                        attrs="{'required': [('nature', '=', 'custom')]}"
-                    />
-                    <field
-                        name="size"
-                        attrs="{'invisible': [('attribute_type', '!=', 'char')]}"
+                        readonly="create_date"
+                        required="nature == 'custom'"
                     />
+                    <field name="attribute_type" required="nature == 'custom'" />
+                    <field name="size" invisible="attribute_type != 'char'" />
                     <field
                         name="translate"
-                        attrs="{'invisible': [('attribute_type', 'not in', ('char', 'text'))]}"
-                    />
-                    <field
-                        name="serialized"
-                        attrs="{'readonly': [('create_date', '!=', False)]}"
+                        invisible="attribute_type not in ('char', 'text')"
                     />
+                    <field name="serialized" readonly="create_date" />
                 </group>
                 <separator />
-                <group col="2" class="col-6">
+                <group col="4" colspan="4">
                     <field
                         name="field_id"
                         string="Related native field"
                         options="{'no_create_edit': 1}"
-                        attrs="{
-                                    'required': [('nature', '=', 'native')],
-                                    'invisible': [('nature', '=', 'custom')],
-                                    'readonly': [('model_id', '=', False)],
-                                }"
+                        required="nature == 'native'"
+                        invisible="nature == 'custom'"
+                        readonly="not model_id"
                     />
                     <field
                         name="attribute_group_id"
@@ -84,7 +63,7 @@
                     <field name="create_date" invisible="1" />
                 </group>
                 <group
-                    attrs="{'invisible': ['|', ('attribute_type', 'not in', ['select', 'multiselect']), ('nature', '=', 'native')]}"
+                    invisible="attribute_type not in ('select', 'multiselect') or nature == 'native'"
                     col="4"
                     colspan="4"
                 >
@@ -94,39 +73,37 @@
                         col="4"
                     >
                         <group colspan="2">
-                            <field
-                                name="relation_model_id"
-                                attrs="{'readonly': [('create_date', '!=', False)]}"
-                            />
+                            <field name="relation_model_id" readonly="create_date" />
+                            <field name="relation_model_name" invisible="1" />
+                        </group>
+                        <group invisible="not relation_model_id" colspan="4">
                             <field
                                 name="domain"
-                                attrs="{'invisible': [('relation_model_id', '=', False)]}"
+                                widget="domain"
+                                options="{'model': 'relation_model_name', 'in_dialog': true}"
+                                invisible="not relation_model_id"
                             />
-                        </group>
-                        <newline />
-                        <group
-                            colspan="2"
-                            attrs="{'invisible': [('relation_model_id', '=', False)]}"
-                        >
                             <button
                                 name="button_add_options"
-                                attrs="{'invisible': [('domain', 'not in', [False, '[]'] )]}"
                                 type="object"
                                 string="Load Attribute Options"
                                 class="oe_highlight"
-                                colspan="1"
+                                colspan="2"
                             />
                         </group>
                     </group>
-                    <group colspan="4">
+                    <group col="4" colspan="4">
                         <field name="option_ids" string="Attribute Options" colspan="4">
                             <tree editable="top">
-                                <field name="relation_model_id" invisible="1" />
-                                <field name="value_ref" invisible="1" />
-                                <field name="sequence" invisible="1" />
+                                <field
+                                    name="relation_model_id"
+                                    column_invisible="True"
+                                />
+                                <field name="value_ref" column_invisible="True" />
+                                <field name="sequence" column_invisible="True" />
                                 <field
                                     name="name"
-                                    attrs="{'invisible': [('relation_model_id', '!=', False), ('value_ref', 'in', [False, ''])]}"
+                                    invisible="relation_model_id and not value_ref"
                                 />
                             </tree>
                         </field>
@@ -143,7 +120,7 @@
                 <field
                     name="sequence"
                     widget="handle"
-                    invisible="not context.get('active_attribute_sort')"
+                    column_invisible="not context.get('active_attribute_sort')"
                 />
                 <field name="field_description" />
                 <field name="attribute_type" />
@@ -177,7 +154,7 @@
         <field name="view_mode">tree,form</field>
         <field name="search_view_id" ref="view_attribute_attribute_search" />
         <field name="context">
-            {"search_default_attribute_group_id": active_id, "active_attribute_sort":
+            {"search_default_attribute_group_id": id, "active_attribute_sort":
             True}
         </field>
         <field name="help" />
diff --git a/attribute_set/views/attribute_group_view.xml b/attribute_set/views/attribute_group_view.xml
index 993d381f..85f76a71 100644
--- a/attribute_set/views/attribute_group_view.xml
+++ b/attribute_set/views/attribute_group_view.xml
@@ -17,7 +17,10 @@
             <tree editable="bottom">
                 <field name="sequence" widget="handle" />
                 <field name="name" />
-                <field name="model_id" invisible="context.get('default_model_id')" />
+                <field
+                    name="model_id"
+                    column_invisible="context.get('default_model_id')"
+                />
                 <button
                     string="Sort Attribute"
                     name="%(attribute_attribute_sort_action)d"
diff --git a/attribute_set/views/attribute_option_view.xml b/attribute_set/views/attribute_option_view.xml
index 5b56d88c..6aa12194 100644
--- a/attribute_set/views/attribute_option_view.xml
+++ b/attribute_set/views/attribute_option_view.xml
@@ -13,7 +13,7 @@
                         name="value_ref"
                         colspan="2"
                         groups="attribute_set.group_advanced_attribute_set"
-                        attrs="{'invisible':[('relation_model_id', '=', False)]}"
+                        invisible="not relation_model_id"
                     />
                     <field name="sequence" colspan="2" />
                 </group>
@@ -32,7 +32,7 @@
                         name="value_ref"
                         colspan="2"
                         groups="attribute_set.group_advanced_attribute_set"
-                        attrs="{'invisible':[('relation_model_id', '=', False)]}"
+                        invisible="not relation_model_id"
                     />
                     <field name="sequence" colspan="2" />
                     <field name="attribute_id" colspan="2" />
diff --git a/attribute_set/wizard/__init__.py b/attribute_set/wizard/__init__.py
deleted file mode 100644
index 10a983cc..00000000
--- a/attribute_set/wizard/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import attribute_option_wizard
diff --git a/attribute_set/wizard/attribute_option_wizard.py b/attribute_set/wizard/attribute_option_wizard.py
deleted file mode 100644
index f32526ed..00000000
--- a/attribute_set/wizard/attribute_option_wizard.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2011 Akretion (http://www.akretion.com).
-# @author Benoît GUILLOT <benoit.guillot@akretion.com>
-# @author Raphaël VALYI <raphael.valyi@akretion.com>
-# Copyright 2015 Savoir-faire Linux
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-
-from lxml import etree
-
-from odoo import api, fields, models
-
-
-class AttributeOptionWizard(models.TransientModel):
-    _name = "attribute.option.wizard"
-    _rec_name = "attribute_id"
-    _description = "Custom Attributes Option"
-
-    attribute_id = fields.Many2one(
-        "attribute.attribute",
-        "Product Attribute",
-        required=True,
-        default=lambda self: self.env.context.get("attribute_id", False),
-        ondelete="cascade",
-    )
-
-    def validate(self):
-        return True
-
-    @api.model_create_multi
-    def create(self, vals_list):
-        attr_obj = self.env["attribute.attribute"]
-        for vals in vals_list:
-            attr = attr_obj.browse(vals["attribute_id"])
-
-            opt_obj = self.env["attribute.option"]
-
-            for op_id in vals.get("option_ids") and vals["option_ids"][0][2] or []:
-                model = attr.relation_model_id.model
-
-                name = self.env[model].browse(op_id).name_get()[0][1]
-                opt_obj.create(
-                    {
-                        "attribute_id": vals["attribute_id"],
-                        "name": name,
-                        "value_ref": f"{attr.relation_model_id.model},{op_id}",
-                    }
-                )
-            if vals.get("option_ids"):
-                del vals["option_ids"]
-        return super().create(vals_list)
-
-    # Hack to circumvent the fact that option_ids never actually exists in the DB,
-    # thus crashing when read is called after create
-    def read(self, fields=None, load="_classic_read"):
-        if "option_ids" in fields:
-            fields.remove("option_ids")
-        return super().read(fields, load)
-
-    @api.model
-    def get_views(self, views, options=None):
-        context = self.env.context
-        res = super().get_views(views, options=options)
-        if (
-            "views" in res
-            and "form" in res["views"]
-            and context
-            and context.get("attribute_id")
-        ):
-            attr_obj = self.env["attribute.attribute"]
-            attr = attr_obj.browse(context.get("attribute_id"))
-            model = attr.relation_model_id
-
-            relation = model.model
-            domain_ids = [op.value_ref.id for op in attr.option_ids if op.value_ref]
-
-            res["models"][self._name].update(
-                {
-                    "option_ids": {
-                        "domain": [("id", "not in", domain_ids)],
-                        "string": "Options",
-                        "type": "many2many",
-                        "relation": relation,
-                        "required": True,
-                    }
-                }
-            )
-
-            eview = etree.fromstring(res["views"]["form"]["arch"])
-            options = etree.Element("field", name="option_ids", nolabel="1")
-            placeholder = eview.xpath("//separator[@string='options_placeholder']")[0]
-            placeholder.getparent().replace(placeholder, options)
-            res["views"]["form"]["arch"] = etree.tostring(eview, pretty_print=True)
-
-        return res
diff --git a/attribute_set/wizard/attribute_option_wizard_view.xml b/attribute_set/wizard/attribute_option_wizard_view.xml
deleted file mode 100644
index cf3722ad..00000000
--- a/attribute_set/wizard/attribute_option_wizard_view.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <record id="attribute_option_wizard_form_view" model="ir.ui.view">
-        <field name="name">attribute.option.wizard</field>
-        <field name="model">attribute.option.wizard</field>
-        <field name="arch" type="xml">
-            <form string="Options Wizard">
-                <field name="attribute_id" invisible="1" />
-                <group>
-                    <separator string="options_placeholder" />
-                </group>
-                <footer>
-                    <button
-                        name="validate"
-                        string="Validate"
-                        type="object"
-                        class="oe_highlight"
-                    />
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </footer>
-            </form>
-        </field>
-    </record>
-</odoo>
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 00000000..66bc2cba
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1 @@
+odoo_test_helper