diff --git a/addons/l10n_es/data/template/account.account-es_full.csv b/addons/l10n_es/data/template/account.account-es_full.csv
index d8795ef407196..34968263bfe74 100644
--- a/addons/l10n_es/data/template/account.account-es_full.csv
+++ b/addons/l10n_es/data/template/account.account-es_full.csv
@@ -12,7 +12,7 @@
 "account_full_147","Provisions for share-based payment transactions","Provisión por transacciones con pagos basados en instrumentos de patrimonio","Provisió per transaccions amb pagaments basats en instruments de patrimoni","147","liability_non_current","True","","","","",""
 "account_full_1765","Non-current liabilities arising from derivative financial instruments, trading portfolio","Pasivos por derivados financieros, carter de negociación","Passius per derivats financers a llarg termini, cartera de negociació","1765","liability_non_current","True","","","","",""
 "account_full_1768","Non-current liabilities arising from derivative financial instruments, hedging instruments","Pasivos por derivados financieros, instrumentos de cobertura","Passius per derivats financers a llarg termini, instruments de cobertura","1768","liability_non_current","True","","","","",""
-"account_full_204","Goodwill","Fondo de comercio","Fons de comerç","204","asset_fixed","False","account_tax_template_p_iva21_bi","Goodwill from business acquisitions","Fondo de comercio procedente de adquisiciones de empresas","Fons de comerç procedent d'adquisicions d'empreses","asset_full_goodwill"
+"account_full_204","Goodwill","Fondo de comercio","Fons de comerç","204","asset_fixed","False","account_tax_template_p_iva21_bi","Goodwill from business acquisitions","Fondo de comercio procedente de adquisiciones de empresas","Fons de comerç procedent d'adquisicions d'empreses",""
 "account_full_2405","Non-current investments in other related parties","Participaciones en otras partes vinculadas","Participacions a llarg termini en altres parts vinculades","2405","asset_fixed","False","","","","",""
 "account_full_2495","Non-current uncalled equity holdings in other related parties","Desembolsos pendientes sobre participaciones en otras partes vinculadas","Desemborsaments pendents sobre participacions a llarg termini en altres parts vinculades","2495","asset_fixed","False","","","","",""
 "account_full_2553","Non-current assets arising from derivative financial instruments, hedging instruments","Activos por derivados financieros, instrumentos de cobertura","Actius per derivats financers a llarg termini, instruments de cobertura","2553","asset_fixed","False","","","","",""
diff --git a/addons/l10n_es/data/template/account.asset-es.csv b/addons/l10n_es/data/template/account.asset-es.csv
new file mode 100644
index 0000000000000..e924c353f7ac2
--- /dev/null
+++ b/addons/l10n_es/data/template/account.asset-es.csv
@@ -0,0 +1,19 @@
+"id","account_asset_id","account_depreciation_id","account_expense_id","name","method_number","method_period"
+"asset_model_research","280000","280000","680000","Research","5","12"
+"asset_model_development","280000","280000","680000","Development","5","12"
+"asset_model_admin_concessions","280000","280000","682000","Administrative concessions","5","12"
+"asset_model_industrial_property","280000","280000","682000","Industrial property","10","12"
+"asset_model_goodwill","280000","280000","682000","Goodwill","10","12"
+"asset_model_leaseholds","280000","280000","682000","Leaseholds","5","12"
+"asset_model_software","280000","280000","682000","Computer software","5","12"
+"asset_model_advances_intangibles","280000","280000","682000","Advances for intangible assets","5","12"
+"asset_model_buildings","281100","281100","681000","Buildings","30","12"
+"asset_model_technical_installations","281200","281200","681000","Technical installations","10","12"
+"asset_model_machinery","281300","281300","681000","Machinery","8","12"
+"asset_model_equipment","281400","281400","681000","Equipment","5","12"
+"asset_model_other_installations","281500","281500","681000","Other installations","10","12"
+"asset_model_furniture","281600","281600","681000","Furniture","10","12"
+"asset_model_it_equipment","281700","281700","681000","Information technology equipment","4","12"
+"asset_model_motor_vehicles","281800","281800","681000","Motor vehicles","4","12"
+"asset_model_other_property","281900","281900","681000","Other property, plant and equipment","5","12"
+"asset_model_investments_buildings","282000","282000","682000","Investments in buildings","30","12"
diff --git a/addons/l10n_es/data/template/account.asset-es_common.csv b/addons/l10n_es/data/template/account.asset-es_common.csv
deleted file mode 100644
index 826fbc9ed0ab0..0000000000000
--- a/addons/l10n_es/data/template/account.asset-es_common.csv
+++ /dev/null
@@ -1,18 +0,0 @@
-"id","name","name@es","name@ca","account_asset_id","account_depreciation_id","account_depreciation_expense_id","method_number"
-"asset_common_research","Research","Investigación","Recerca","account_common_200","account_common_2800","account_common_680","5"
-"asset_common_development","Development","Desarrollo","Desenvolupament","account_common_201","account_common_2800","account_common_680","5"
-"asset_common_administrative_concessions","Administrative concessions","Concesiones administrativas","Concessions administratives","account_common_202","account_common_2800","account_common_682","5"
-"asset_common_industrial_property","Industrial property","Propiedad industrial","Propietat industrial","account_common_203","account_common_2800","account_common_682","10"
-"asset_common_leaseholds","Leaseholds","Derechos de traspaso","Drets de traspàs","account_common_205","account_common_2800","account_common_682","5"
-"asset_common_computer_software","Computer software","Aplicaciones informáticas","Aplicacions informàtiques","account_common_206","account_common_2800","account_common_682","5"
-"asset_common_advances_for_intangible_assets","Advances for intangible assets","Anticipos para inmovilizaciones intangibles","Avançaments per a immobilitzacions intangibles","account_common_209","account_common_2800","account_common_682","5"
-"asset_common_buildings","Buildings","Construcciones","Construccions","account_common_211","account_common_2811","account_common_681","30"
-"asset_common_technical_installations","Technical installations","Instalaciones técnicas","Instal·lacions tècniques","account_common_212","account_common_2812","account_common_681","10"
-"asset_common_machinery","Machinery","Maquinaria","Maquinària","account_common_213","account_common_2813","account_common_681","8"
-"asset_common_equipement","Equipment","Utillaje","Utillatge","account_common_214","account_common_2814","account_common_681","5"
-"asset_common_other_installations","Other installations","Otras instalaciones","Altres instal·lacions","account_common_215","account_common_2815","account_common_681","10"
-"asset_common_furniture","Furniture","Mobiliario","Mobiliari","account_common_216","account_common_2816","account_common_681","10"
-"asset_common_information_technology_equipment","Information technology equipment","Equipos para proceso de información","Equips per a processos d’informació","account_common_217","account_common_2817","account_common_681","4"
-"asset_common_motor_vehicles","Motor vehicles","Elementos de transporte","Elements de transport","account_common_218","account_common_2818","account_common_681","4"
-"asset_common_other_property_plant_equipment","Other property, plant and equipment","Otro inmovilizado material","Altre immobilitzat material","account_common_219","account_common_2819","account_common_681","5"
-"asset_common_investment_in_buildings","Investments in buildings","Inversiones en construcciones","Inversions en construccions","account_common_221","account_common_282","account_common_682","30"
diff --git a/addons/l10n_es/data/template/account.asset-es_full.csv b/addons/l10n_es/data/template/account.asset-es_full.csv
deleted file mode 100644
index ea3916cbdfa3f..0000000000000
--- a/addons/l10n_es/data/template/account.asset-es_full.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"id","name","name@es","name@ca","account_asset_id","account_depreciation_id","account_depreciation_expense_id","method_number"
-"asset_full_goodwill","Goodwill","Fondo de comercio","Fons de comerç","account_full_204","account_common_2800","account_common_682","10"
diff --git a/addons/l10n_es/views/account_move_views.xml b/addons/l10n_es/views/account_move_views.xml
index fda5364a3bfde..9ac07b1c7b67e 100644
--- a/addons/l10n_es/views/account_move_views.xml
+++ b/addons/l10n_es/views/account_move_views.xml
@@ -6,8 +6,8 @@
         <field name="inherit_id" ref="account.view_move_form"/>
         <field name="arch" type="xml">
             <xpath expr="//page[@id='other_tab']//field[@name='delivery_date']" position="after">
-                <field name="l10n_es_is_simplified" invisible="country_code != 'ES'" readonly="state != 'draft'"/>
+                <field name="l10n_es_is_simplified"/>
             </xpath>
         </field>
     </record>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/addons/l10n_es_edi_facturae/data/facturae_templates.xml b/addons/l10n_es_edi_facturae/data/facturae_templates.xml
index 8ca52377cc176..e79bc7b27125a 100644
--- a/addons/l10n_es_edi_facturae/data/facturae_templates.xml
+++ b/addons/l10n_es_edi_facturae/data/facturae_templates.xml
@@ -128,7 +128,6 @@
             <InvoiceLine>
                 <ReceiverContractReference t-out="line.get('ReceiverContractReference')"/>
                 <ReceiverTransactionReference t-out="line.get('ReceiverTransactionReference')"/>
-                <FileReference t-out="line.get('FileReference')"/>
                 <FileDate t-out="line.get('FileDate')"/>
                 <SequenceNumber t-out="line.get('SequenceNumber')"/>
                 <ItemDescription t-out="line['ItemDescription']"/>
@@ -207,7 +206,6 @@
                     <TaxCurrencyCode t-out="invoice['invoice_currency'].name"/>
                     <LanguageName t-out="invoice['InvoiceIssueData']['LanguageName']"/>
                     <ReceiverTransactionReference t-out="invoice['InvoiceIssueData']['ReceiverTransactionReference']"/>
-                    <FileReference t-out="invoice['InvoiceIssueData']['FileReference']"/>
                     <ReceiverContractReference t-out="invoice['InvoiceIssueData']['ReceiverContractReference']"/>
                 </InvoiceIssueData>
                 <TaxesOutputs>
diff --git a/addons/l10n_es_edi_facturae/models/account_move.py b/addons/l10n_es_edi_facturae/models/account_move.py
index 0f05d038a032b..5f402122a5fdb 100644
--- a/addons/l10n_es_edi_facturae/models/account_move.py
+++ b/addons/l10n_es_edi_facturae/models/account_move.py
@@ -315,7 +315,6 @@ def _l10n_es_edi_facturae_prepare_inv_line(self, base_line, aggregated_values):
 
         xml_values = {
             'ReceiverTransactionReference': receiver_transaction_reference,
-            'FileReference': invoice_ref,
             'ReceiverContractReference': invoice_ref,
             'FileDate': fields.Date.context_today(self),
             'ItemDescription': line.name,
@@ -421,7 +420,6 @@ def extract_party_name(party):
                 'LanguageName': self.env.context.get('lang', 'en_US').split('_')[0],
                 'InvoicingPeriod': None,
                 'ReceiverTransactionReference': invoice_ref,
-                'FileReference': invoice_ref,
                 'ReceiverContractReference': invoice_ref,
             },
             'TaxOutputs': [],
diff --git a/addons/l10n_es_edi_facturae/tests/data/expected_refund_document.xml b/addons/l10n_es_edi_facturae/tests/data/expected_refund_document.xml
index be4cb775d2d91..4f75c0385a91d 100644
--- a/addons/l10n_es_edi_facturae/tests/data/expected_refund_document.xml
+++ b/addons/l10n_es_edi_facturae/tests/data/expected_refund_document.xml
@@ -80,7 +80,6 @@
         <TaxCurrencyCode>EUR</TaxCurrencyCode>
         <LanguageName>en</LanguageName>
         <ReceiverTransactionReference>ABCD-2023-001</ReceiverTransactionReference>
-        <FileReference>ABCD-2023-001</FileReference>
         <ReceiverContractReference>ABCD-2023-001</ReceiverContractReference>
       </InvoiceIssueData>
       <TaxesOutputs>
@@ -118,7 +117,6 @@
         <InvoiceLine>
           <ReceiverContractReference>ABCD-2023-001</ReceiverContractReference>
           <ReceiverTransactionReference>ABCD-2023-001</ReceiverTransactionReference>
-          <FileReference>ABCD-2023-001</FileReference>
           <FileDate>2023-01-01</FileDate>
           <ItemDescription>product_a</ItemDescription>
           <Quantity>1.0</Quantity>
@@ -142,7 +140,6 @@
         <InvoiceLine>
           <ReceiverContractReference>ABCD-2023-001</ReceiverContractReference>
           <ReceiverTransactionReference>ABCD-2023-001</ReceiverTransactionReference>
-          <FileReference>ABCD-2023-001</FileReference>
           <FileDate>2023-01-01</FileDate>
           <ItemDescription>product_a</ItemDescription>
           <Quantity>1.0</Quantity>