diff --git a/l10n_it_fatturapa/__manifest__.py b/l10n_it_fatturapa/__manifest__.py
index a6650b00f004..d807b6de71f5 100644
--- a/l10n_it_fatturapa/__manifest__.py
+++ b/l10n_it_fatturapa/__manifest__.py
@@ -22,7 +22,7 @@
         "l10n_it_rea",
         "base_iban",
         "l10n_it_account_tax_kind",
-        "l10n_it_esigibilita_iva",
+        "l10n_it_vat_payability",
         "l10n_it_fiscal_payment_term",
         "l10n_it_split_payment",
         "l10n_it_fiscal_document_type",
diff --git a/l10n_it_fatturapa/demo/account_invoice_fatturapa.xml b/l10n_it_fatturapa/demo/account_invoice_fatturapa.xml
index 945fdb39215c..fc1d47e02d7e 100644
--- a/l10n_it_fatturapa/demo/account_invoice_fatturapa.xml
+++ b/l10n_it_fatturapa/demo/account_invoice_fatturapa.xml
@@ -124,8 +124,6 @@
 
         <record id="res_partner_fatturapa_0" model="res.partner">
             <field name="name">Public Administration</field>
-            <field name="customer">1</field>
-            <field name="supplier">0</field>
             <field name="is_company">1</field>
             <field name="is_pa">1</field>
             <field name="city">Torino</field>
@@ -143,8 +141,6 @@
 
         <record id="res_partner_fatturapa_1" model="res.partner">
             <field name="name">Intermediary</field>
-            <field name="customer">0</field>
-            <field name="supplier">1</field>
             <field name="is_company">1</field>
             <field name="city">Torino</field>
             <field name="zip">10100</field>
@@ -159,8 +155,6 @@
 
         <record id="res_partner_fatturapa_2" model="res.partner">
             <field name="name">B2B Customer</field>
-            <field name="customer">1</field>
-            <field name="supplier">0</field>
             <field name="is_company">1</field>
             <field name="is_pa">0</field>
             <field name="city">Genova</field>
@@ -186,8 +180,6 @@
 
         <record id="res_partner_fatturapa_4" model="res.partner">
             <field name="name">Foreign Customer</field>
-            <field name="customer">1</field>
-            <field name="supplier">0</field>
             <field name="is_company">1</field>
             <field name="street">29-17 Al Thanya St</field>
             <field name="is_pa">0</field>
diff --git a/l10n_it_fatturapa/models/partner.py b/l10n_it_fatturapa/models/partner.py
index afe63bc98153..c8c3f919d1bf 100644
--- a/l10n_it_fatturapa/models/partner.py
+++ b/l10n_it_fatturapa/models/partner.py
@@ -80,7 +80,6 @@ def _compute_electronic_invoice_data_complete(self):
         "fiscalcode",
         "lastname",
         "firstname",
-        "customer",
         "street",
         "zip",
         "city",
@@ -89,9 +88,7 @@ def _compute_electronic_invoice_data_complete(self):
     )
     def _check_ftpa_partner_data(self):
         for partner in self:
-            if partner.electronic_invoice_subjected and partner.customer:
-                # These checks must be done for customers only, as only
-                # needed for XML generation
+            if partner.electronic_invoice_subjected:
                 if partner.is_pa and (
                     not partner.ipa_code or len(partner.ipa_code) != 6
                 ):
@@ -182,10 +179,6 @@ def onchange_country_id_e_inv(self):
     def onchange_electronic_invoice_subjected(self):
         if not self.electronic_invoice_subjected:
             self.electronic_invoice_obliged_subject = False
-        else:
-            if self.supplier:
-                self.onchange_country_id_e_inv()
-                self.electronic_invoice_obliged_subject = True
 
     @api.onchange("electronic_invoice_obliged_subject")
     def onchange_e_inv_obliged_subject(self):
diff --git a/l10n_it_fatturapa/views/partner_view.xml b/l10n_it_fatturapa/views/partner_view.xml
index 15cda078f08b..e98a889b6479 100644
--- a/l10n_it_fatturapa/views/partner_view.xml
+++ b/l10n_it_fatturapa/views/partner_view.xml
@@ -13,14 +13,8 @@
                     groups="account.group_account_invoice"
                 >
                 <group name="fatturapa_group">
-                    <label
-                            for="electronic_invoice_no_contact_update"
-                            attrs="{'invisible': [('supplier', '=', False)]}"
-                        />
-                    <field
-                            name="electronic_invoice_no_contact_update"
-                            attrs="{'invisible': [('supplier', '=', False)]}"
-                        />
+                    <label for="electronic_invoice_no_contact_update" />
+                    <field name="electronic_invoice_no_contact_update" />
                     <group>
                         <field name="electronic_invoice_subjected" />
                         <field