diff --git a/account_invoice_en16931/views/account_move.xml b/account_invoice_en16931/views/account_move.xml
index 823ceb7..981c0f4 100644
--- a/account_invoice_en16931/views/account_move.xml
+++ b/account_invoice_en16931/views/account_move.xml
@@ -47,7 +47,7 @@
                     name="%(account_invoice_en16931_action)s"
                     string="Generate eInvoice"
                     type="action"
-                    invisible="move_type not in ('out_invoice', 'out_refund') or state == 'cancel'"
+                    attrs="{'invisible': ['|', ('move_type', 'not in', ('out_invoice', 'out_refund')), ('state', '=', 'cancel')]}"
                 />
             </field>
             -->
diff --git a/l10n_fr_einvoicing/views/res_partner.xml b/l10n_fr_einvoicing/views/res_partner.xml
index 6100729..ba2d624 100644
--- a/l10n_fr_einvoicing/views/res_partner.xml
+++ b/l10n_fr_einvoicing/views/res_partner.xml
@@ -94,7 +94,7 @@
             </xpath>
             <!--
                                   <div name="button_box" position="inside">
-                                          <button name="%(l10n_fr_einvoicing.fr_directory_line_action)d" context="{'search_default_partner_id': id, 'search_default_active': True}" class="oe_stat_button" type="action" icon="fa-newspaper-o" invisible="not fr_directory_line_show">
+                                          <button name="%(l10n_fr_einvoicing.fr_directory_line_action)d" context="{'search_default_partner_id': id, 'search_default_active': True}" class="oe_stat_button" type="action" icon="fa-newspaper-o" attrs="{'invisible': [('fr_directory_line_show', '=', False)]}">
                                                   <field string="Active Directory Lines" name="fr_directory_line_active_count" widget="statinfo" />
                                           </button>
         </div> -->
diff --git a/l10n_fr_einvoicing_directory_import/__manifest__.py b/l10n_fr_einvoicing_directory_import/__manifest__.py
index b9e5f99..6cad4d6 100644
--- a/l10n_fr_einvoicing_directory_import/__manifest__.py
+++ b/l10n_fr_einvoicing_directory_import/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 {
     "name": "France eInvoicing Directory Import/Export (CSV)",
-    "version": "18.0.1.0.0",
+    "version": "16.0.1.0.0",
     "category": "Accounting/Localizations/EDI",
     "summary": "Maintain fr.directory.line manually via CSV export/import "
     "when the AFNOR directory API is not available",
diff --git a/l10n_fr_einvoicing_directory_import/wizards/fr_directory_csv_wizard_views.xml b/l10n_fr_einvoicing_directory_import/wizards/fr_directory_csv_wizard_views.xml
index 19f75a7..d069ba9 100644
--- a/l10n_fr_einvoicing_directory_import/wizards/fr_directory_csv_wizard_views.xml
+++ b/l10n_fr_einvoicing_directory_import/wizards/fr_directory_csv_wizard_views.xml
@@ -69,10 +69,10 @@
                     name="result_summary"
                     readonly="1"
                     nolabel="1"
-                    invisible="not result_summary"
+                    attrs="{'invisible': [('result_summary', '=', False)]}"
                 />
                 <field name="result_partner_ids" invisible="1" />
-                <div class="mt-2" invisible="not result_partner_ids">
+                <div class="mt-2" attrs="{'invisible': [('result_partner_ids', '=', [])]}">
                     <button
                         name="action_view_partners"
                         type="object"