diff --git a/l10n_es_aeat_mod347/data/l10n.es.aeat.map.tax.line.csv b/l10n_es_aeat_mod347/data/l10n.es.aeat.map.tax.line.csv
index 22238ddbff7..b8203fd6857 100644
--- a/l10n_es_aeat_mod347/data/l10n.es.aeat.map.tax.line.csv
+++ b/l10n_es_aeat_mod347/data/l10n.es.aeat.map.tax.line.csv
@@ -1,3 +1,3 @@
 id,field_number,field_type,inverse,map_parent_id:id,move_type,name,sum_type,tax_xmlid_ids/id,to_regularize
-aeat_mod347_map_a,"01","both","False","aeat_mod347_map","regular","A - Adquisiciones de bienes y servicios superiores al límite","both","p_iva21_bc,p_iva21_sc,p_iva4_bi,p_iva4_sc,p_iva10_bi,p_iva21_bi,p_iva10_bc,p_iva4_bc,p_iva10_sc,p_iva0_nd,p_iva0_bc,p_iva0_ns,p_iva0_ns_b,p_iva12_agr,p_req014,p_req05,p_req52,p_iva4_isp,p_iva10_isp,p_iva21_isp,p_iva4_isp_bi,p_iva10_isp_bi,p_iva21_isp_bi,p_iva105_gan,p_iva10_nd,p_iva4_nd,p_iva0_isc,p_iva4_sp_ex,p_iva5_isc,p_iva10_sp_ex,p_iva21_sp_ex,p_iva5_bc,p_iva5_sc,p_iva0_s_bc,p_iva0_s_sc,p_req0,p_req062","False"
-aeat_mod347_map_b,"02","both","False","aeat_mod347_map","regular","B - Entregas de bienes y servicios superiores al límite","both","s_iva21b,s_iva21s,s_iva21isp,s_iva_ns,s_iva_ns_b,s_iva0,s_iva0_ns,s_req05,s_iva4b,s_iva10b,s_iva4s,s_iva10s,s_req014,s_req52,s_iva0_isp","False"
+aeat_mod347_map_a,"01","both","False","aeat_mod347_map","regular","A - Adquisiciones de bienes y servicios superiores al límite","both","p_iva21_bc,p_iva21_sc,p_iva4_bi,p_iva4_sc,p_iva10_bi,p_iva21_bi,p_iva10_bc,p_iva4_bc,p_iva10_sc,p_iva0_nd,p_iva0_bc,p_iva0_ns,p_iva0_ns_b,p_iva12_agr,p_req014,p_req05,p_req52,p_iva4_isp,p_iva10_isp,p_iva21_isp,p_iva4_isp_bi,p_iva10_isp_bi,p_iva21_isp_bi,p_iva105_gan,p_iva10_nd,p_iva4_nd,p_iva0_isc,p_iva4_sp_ex,p_iva5_isc,p_iva10_sp_ex,p_iva21_sp_ex,p_iva5_bc,p_iva5_sc,p_iva0_s_bc,p_iva0_s_sc,p_req0,p_req062,p_iva7-5_bc,p_iva7-5_sc,p_iva2_bc,p_iva2_sc,p_req026,p_req1","False"
+aeat_mod347_map_b,"02","both","False","aeat_mod347_map","regular","B - Entregas de bienes y servicios superiores al límite","both","s_iva21b,s_iva21s,s_iva21isp,s_iva_ns,s_iva_ns_b,s_iva0,s_iva0_ns,s_req05,s_iva4b,s_iva10b,s_iva4s,s_iva10s,s_req014,s_req52,s_iva0_isp,s_iva2s,s_iva2b,s_iva7-5s,s_iva7-5b,s_req026,s_req1","False"
diff --git a/l10n_es_aeat_mod347/data/l10n.es.aeat.map.tax.line.tax.csv b/l10n_es_aeat_mod347/data/l10n.es.aeat.map.tax.line.tax.csv
index 05f61df10f7..84bb71219e9 100644
--- a/l10n_es_aeat_mod347/data/l10n.es.aeat.map.tax.line.tax.csv
+++ b/l10n_es_aeat_mod347/data/l10n.es.aeat.map.tax.line.tax.csv
@@ -52,3 +52,15 @@ s_req0,account_tax_template_s_req0
 s_req014,account_tax_template_s_req014
 s_req05,account_tax_template_s_req05
 s_req52,account_tax_template_s_req52
+p_iva7-5_bc,account_tax_template_p_iva7-5_bc
+p_iva7-5_sc,account_tax_template_p_iva7-5_sc
+p_iva2_bc,account_tax_template_p_iva2_bc
+p_iva2_sc,account_tax_template_p_iva2_sc
+p_req026,account_tax_template_p_req026
+p_req1,account_tax_template_p_req1
+s_iva2s,account_tax_template_s_iva2s
+s_iva2b,account_tax_template_s_iva2b
+s_iva7-5s,account_tax_template_s_iva7-5s
+s_iva7-5b,account_tax_template_s_iva7-5b
+s_req026,account_tax_template_s_req026
+s_req1,account_tax_template_s_req1
diff --git a/l10n_es_aeat_mod347/data/mail_template_data.xml b/l10n_es_aeat_mod347/data/mail_template_data.xml
index 5ff392ef4ef..89c0ae55a90 100644
--- a/l10n_es_aeat_mod347/data/mail_template_data.xml
+++ b/l10n_es_aeat_mod347/data/mail_template_data.xml
@@ -15,7 +15,7 @@
             name="model_id"
             ref="l10n_es_aeat_mod347.model_l10n_es_aeat_mod347_partner_record"
         />
-        <field name="auto_delete" eval="True" />
+        <field name="auto_delete" eval="False" />
         <field name="report_template_ids" eval="[(4, ref('347_partner'))]" />
         <field name="lang">{{object.partner_id.lang}}</field>
         <field