diff --git a/addons/l10n_es_edi_sii/models/account_edi_format.py b/addons/l10n_es_edi_sii/models/account_edi_format.py
index cea366d483c..33fe6b95614 100644
--- a/addons/l10n_es_edi_sii/models/account_edi_format.py
+++ b/addons/l10n_es_edi_sii/models/account_edi_format.py
@@ -249,12 +249,10 @@ class AccountEdiFormat(models.Model):
     def _l10n_es_edi_get_invoices_info(self, invoices):
         eu_country_codes = set(self.env.ref('base.europe').country_ids.mapped('code'))
 
-        simplified_partner = self.env.ref("l10n_es_edi_sii.partner_simplified")
-
         info_list = []
         for invoice in invoices:
             com_partner = invoice.commercial_partner_id
-            is_simplified = invoice.partner_id == simplified_partner
+            is_simplified = invoice.l10n_es_is_simplified
 
             info = {
                 'PeriodoLiquidacion': {
diff --git a/addons/l10n_es_edi_tbai/data/template_invoice.xml b/addons/l10n_es_edi_tbai/data/template_invoice.xml
index 0e280e9fb30..212d01b12cd 100644
--- a/addons/l10n_es_edi_tbai/data/template_invoice.xml
+++ b/addons/l10n_es_edi_tbai/data/template_invoice.xml
@@ -72,7 +72,7 @@
         </template>
 
         <template id="template_invoice_factura">
-            <t t-set="is_simplified" t-value="invoice._is_l10n_es_tbai_simplified()"/>
+            <t t-set="is_simplified" t-value="invoice.l10n_es_is_simplified"/>
             <CabeceraFactura>
                 <t t-set="seq_and_num" t-value="invoice._get_l10n_es_tbai_sequence_and_number()"/>
                 <SerieFactura t-out="seq_and_num[0]"/>
diff --git a/addons/l10n_es_edi_tbai/models/account_edi_format.py b/addons/l10n_es_edi_tbai/models/account_edi_format.py
index 0ad18e3ecb1..949abaea35c 100644
--- a/addons/l10n_es_edi_tbai/models/account_edi_format.py
+++ b/addons/l10n_es_edi_tbai/models/account_edi_format.py
@@ -89,7 +89,7 @@ class AccountEdiFormat(models.Model):
         if invoice.move_type == 'out_refund':
             if not invoice.l10n_es_tbai_refund_reason:
                 raise ValidationError(_('Refund reason must be specified (TicketBAI)'))
-            if invoice._is_l10n_es_tbai_simplified():
+            if invoice.l10n_es_is_simplified:
                 if invoice.l10n_es_tbai_refund_reason != 'R5':
                     raise ValidationError(_('Refund reason must be R5 for simplified invoices (TicketBAI)'))
             else:
@@ -265,7 +265,7 @@ class AccountEdiFormat(models.Model):
 
         # NOTE: TicketBai supports simplified invoices WITH recipients but we don't for now (we should for POS)
         # NOTE: TicketBAI credit notes for simplified invoices are ALWAYS simplified BUT can have a recipient even if invoice doesn't
-        if invoice._is_l10n_es_tbai_simplified():
+        if invoice.l10n_es_is_simplified:
             return values  # do not set 'recipient' unless there is an actual recipient (used as condition in template)
 
         # === RECIPIENTS (DESTINATARIOS) ===
@@ -347,7 +347,7 @@ class AccountEdiFormat(models.Model):
         else:
             values['regime_key'] = ['02']
 
-        if invoice._is_l10n_es_tbai_simplified():
+        if invoice.l10n_es_is_simplified:
             values['regime_key'].append(52)  # code for simplified invoices
 
         return values
diff --git a/addons/l10n_es_edi_tbai/models/account_move.py b/addons/l10n_es_edi_tbai/models/account_move.py
index e45cb8f4353..90bd00b9df7 100644
--- a/addons/l10n_es_edi_tbai/models/account_move.py
+++ b/addons/l10n_es_edi_tbai/models/account_move.py
@@ -221,6 +221,3 @@ class AccountMove(models.Model):
             self.l10n_es_tbai_cancel_xml = b64_doc
         else:
             self.l10n_es_tbai_post_xml = b64_doc
-
-    def _is_l10n_es_tbai_simplified(self):
-        return self.commercial_partner_id == self.env.ref("l10n_es_edi_sii.partner_simplified")