diff --git a/addons/l10n_es/data/account_tax_data.xml b/addons/l10n_es/data/account_tax_data.xml
index 18aff5f0e47..9b9b3dd74b6 100644
--- a/addons/l10n_es/data/account_tax_data.xml
+++ b/addons/l10n_es/data/account_tax_data.xml
@@ -297,4 +297,4 @@
         <field name="applicability">taxes</field>
         <field name="country_id" ref="base.es"/>
     </record>
-    </odoo>
+</odoo>
diff --git a/addons/l10n_es/data/template/account.fiscal.position-es_common.csv b/addons/l10n_es/data/template/account.fiscal.position-es_common.csv
index 413a2fe21bb..9d69ceec411 100644
--- a/addons/l10n_es/data/template/account.fiscal.position-es_common.csv
+++ b/addons/l10n_es/data/template/account.fiscal.position-es_common.csv
@@ -99,8 +99,8 @@
 "","","","","","","","account_tax_template_s_iva21s","account_tax_template_s_req52","",""
 "","","","","","","","account_tax_template_s_iva21isp","account_tax_template_s_iva21isp","",""
 "","","","","","","","account_tax_template_s_iva21isp","account_tax_template_s_req52","",""
-"","","","","","","","account_tax_template_p_iva0_bc","account_tax_template_p_iva0_bc","",""
-"","","","","","","","account_tax_template_p_iva0_bc","account_tax_template_p_req0","",""
+"","","","","","","","account_tax_template_p_iva0_s_bc","account_tax_template_p_iva0_s_bc","",""
+"","","","","","","","account_tax_template_p_iva0_s_bc","account_tax_template_p_req0","",""
 "","","","","","","","account_tax_template_p_iva0_s_sc","account_tax_template_p_iva0_s_sc","",""
 "","","","","","","","account_tax_template_p_iva0_s_sc","account_tax_template_p_req0","",""
 "","","","","","","","account_tax_template_p_iva4_bc","account_tax_template_p_iva4_bc","",""
diff --git a/addons/l10n_es/data/template/account.tax-es_common.csv b/addons/l10n_es/data/template/account.tax-es_common.csv
index 2979b66c411..f506b167832 100644
--- a/addons/l10n_es/data/template/account.tax-es_common.csv
+++ b/addons/l10n_es/data/template/account.tax-es_common.csv
@@ -155,17 +155,19 @@
 "","","","","","","","","","","tax","l10n_es.mod_303_33","invoice","account_common_472",""
 "","","","","","","","","","","base","l10n_es.mod_303_40","refund","",""
 "","","","","","","","","","","tax","l10n_es.mod_303_41","refund","account_common_472",""
-"account_tax_template_p_iva5_isc","","","purchase","IVA 5% Importaciones servicios corrientes","5.0","percent","tax_group_iva_5","","","base","l10n_es.mod_303_32","invoice","",""
-"","","","","","","","","","","tax","l10n_es.mod_303_33","invoice","account_common_472",""
-"","","","","","","","","","","base","l10n_es.mod_303_40","refund","",""
+"account_tax_template_p_iva5_isc","","","purchase","IVA 5% Adquisición de servicios extracomunitarios","5.0","percent","tax_group_iva_5","","","base","l10n_es.mod_303_12,l10n_es.mod_303_28","invoice","",""
+"","","","","","","","","","","tax","l10n_es.mod_303_13","invoice","account_common_477","-100"
+"","","","","","","","","","","tax","l10n_es.mod_303_29","invoice","account_common_472",""
+"","","","","","","","","","","base","l10n_es.mod_303_14_purchase,l10n_es.mod_303_40","refund","",""
+"","","","","","","","","","","tax","l10n_es.mod_303_15","refund","account_common_477","-100"
 "","","","","","","","","","","tax","l10n_es.mod_303_41","refund","account_common_472",""
 "account_tax_template_p_iva0_ibc","","","purchase","IVA 0% Importaciones bienes corrientes","0.0","percent","tax_group_iva_0","","","base","l10n_es.mod_303_32","invoice","",""
 "","","","","","","","","","","tax","","invoice","",""
 "","","","","","","","","","","base","l10n_es.mod_303_40","refund","",""
 "","","","","","","","","","","tax","","refund","",""
-"account_tax_template_p_iva0_isc","","","purchase","IVA 0% Importaciones servicios corrientes","0.0","percent","tax_group_iva_0","","","base","l10n_es.mod_303_32","invoice","",""
+"account_tax_template_p_iva0_isc","","","purchase","IVA 0% Adquisición de servicios extracomunitarios","0.0","percent","tax_group_iva_0","","","base","l10n_es.mod_303_12,l10n_es.mod_303_28","invoice","",""
 "","","","","","","","","","","tax","","invoice","",""
-"","","","","","","","","","","base","l10n_es.mod_303_40","refund","",""
+"","","","","","","","","","","base","l10n_es.mod_303_14_purchase,l10n_es.mod_303_40","refund","",""
 "","","","","","","","","","","tax","","refund","",""
 "account_tax_template_p_iva0_s_bc","","","purchase","0% IVA soportado (bienes corrientes)","0.0","percent","tax_group_iva_0","","","base","l10n_es.mod_303_28","invoice","",""
 "","","","","","","","","","","tax","","invoice","",""