diff --git a/CHANGELOG b/CHANGELOG
index 4c0c93ea46..0f263e2209 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* Add purchase service tax group
+
 Version 5.6.0 - 2020-05-04
 * Bug fixes (see mercurial logs for details)
 * Add sale service tax group
diff --git a/tax.xml b/tax.xml
index 9e65c19857..8a71db0c35 100644
--- a/tax.xml
+++ b/tax.xml
@@ -155,7 +155,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="ec_sales_list_code">S</field>
         </record>
         <record model="account.tax.template" id="iva_sop_21">
-            <field name="name">IVA 21% (operaciones corrientes)</field>
+            <field name="name">IVA 21% (bienes)</field>
             <field name="description">IVA 21%</field>
             <field name="account" ref="pgc_0"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -165,8 +165,19 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_472"/>
             <field name="es_vat_list_code">A</field>
         </record>
+        <record model="account.tax.template" id="iva_sop_21_servicios">
+            <field name="name">IVA 21% (servicios)</field>
+            <field name="description">IVA 21%</field>
+            <field name="account" ref="pgc_0"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.21')"/>
+            <field name="invoice_account" ref="pgc_472"/>
+            <field name="credit_note_account" ref="pgc_472"/>
+            <field name="es_vat_list_code">A</field>
+        </record>
         <record model="account.tax.template" id="iva_sop_10">
-            <field name="name">IVA 10% (operaciones corrientes)</field>
+            <field name="name">IVA 10% (bienes)</field>
             <field name="description">IVA 10%</field>
             <field name="account" ref="pgc_0"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -176,8 +187,19 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_472"/>
             <field name="es_vat_list_code">A</field>
         </record>
+        <record model="account.tax.template" id="iva_sop_10_servicios">
+            <field name="name">IVA 10% (servicios)</field>
+            <field name="description">IVA 10%</field>
+            <field name="account" ref="pgc_0"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.1')"/>
+            <field name="invoice_account" ref="pgc_472"/>
+            <field name="credit_note_account" ref="pgc_472"/>
+            <field name="es_vat_list_code">A</field>
+        </record>
         <record model="account.tax.template" id="iva_sop_4">
-            <field name="name">IVA 4% (operaciones corrientes)</field>
+            <field name="name">IVA 4% (bienes)</field>
             <field name="description">IVA 4%</field>
             <field name="account" ref="pgc_0"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -188,7 +210,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="es_vat_list_code">A</field>
         </record>
         <record model="account.tax.template" id="iva_sop_ex">
-            <field name="name">IVA Exento (operaciones corrientes)</field>
+            <field name="name">IVA Exento (bienes)</field>
             <field name="description">IVA Exento</field>
             <field name="account" ref="pgc_0"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -197,6 +219,16 @@ this repository contains the full copyright notices and license terms. -->
             <field name="invoice_account" ref="pgc_4700"/>
             <field name="credit_note_account" ref="pgc_4700"/>
         </record>
+        <record model="account.tax.template" id="iva_sop_ex_servicios">
+            <field name="name">IVA Exento (servicios)</field>
+            <field name="description">IVA Exento</field>
+            <field name="account" ref="pgc_0"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.0')"/>
+            <field name="invoice_account" ref="pgc_4700"/>
+            <field name="credit_note_account" ref="pgc_4700"/>
+        </record>
         <record model="account.tax.template" id="iva_sop_21_inv">
             <field name="name">IVA 21% (bienes de inversión)</field>
             <field name="description">IVA 21%</field>
@@ -241,7 +273,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_4700"/>
         </record>
         <record model="account.tax.template" id="iva_sop_importacion">
-            <field name="name">IVA Importaciones (operaciones corrientes)</field>
+            <field name="name">IVA Importaciones (bienes)</field>
             <field name="description">Importaciones</field>
             <field name="account" ref="pgc_0"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -250,6 +282,16 @@ this repository contains the full copyright notices and license terms. -->
             <field name="invoice_account" ref="pgc_4700"/>
             <field name="credit_note_account" ref="pgc_4700"/>
         </record>
+        <record model="account.tax.template" id="iva_sop_importacion_servicios">
+            <field name="name">IVA Importaciones (servicios)</field>
+            <field name="description">Importaciones</field>
+            <field name="account" ref="pgc_0"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.0')"/>
+            <field name="invoice_account" ref="pgc_4700"/>
+            <field name="credit_note_account" ref="pgc_4700"/>
+        </record>
         <record model="account.tax.template" id="iva_sop_importacion_inv">
             <field name="name">IVA Importaciones (bienes de inversión)</field>
             <field name="description">IVA Importaciones</field>
@@ -261,7 +303,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_4700"/>
         </record>
         <record model="account.tax.template" id="iva_sop_intracomunitario">
-            <field name="name">IVA Intracomunitario (operaciones corrientes)</field>
+            <field name="name">IVA Intracomunitario (bienes)</field>
             <field name="description">IVA Intracomunitario</field>
             <field name="account" ref="pgc_0"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -269,6 +311,15 @@ this repository contains the full copyright notices and license terms. -->
             <field name="invoice_account" ref="pgc_4700"/>
             <field name="credit_note_account" ref="pgc_4700"/>
         </record>
+        <record model="account.tax.template" id="iva_sop_intracomunitario_servicios">
+            <field name="name">IVA Intracomunitario (servicios)</field>
+            <field name="description">IVA Intracomunitario</field>
+            <field name="account" ref="pgc_0"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">none</field>
+            <field name="invoice_account" ref="pgc_4700"/>
+            <field name="credit_note_account" ref="pgc_4700"/>
+        </record>
         <record model="account.tax.template" id="iva_sop_intracomunitario_inv">
             <field name="name">IVA Intracomunitario (bienes de inversión)</field>
             <field name="description">IVA Intracomunitario</field>
@@ -385,7 +436,7 @@ this repository contains the full copyright notices and license terms. -->
     </data>
     <data grouped="1">
         <record model="account.tax.template" id="iva_sop_intracomunitario_1">
-            <field name="name">IVA Intracomunitario. Operaciones corrientes (1)</field>
+            <field name="name">IVA Intracomunitario. Bienes (1)</field>
             <field name="description">IVA Intracomunitario (1)</field>
             <field name="parent" ref="iva_sop_intracomunitario"/>
             <field name="account" ref="pgc_0"/>
@@ -397,7 +448,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="es_ec_purchases_list_code">A</field>
         </record>
         <record model="account.tax.template" id="iva_sop_intracomunitario_2">
-            <field name="name">IVA Intracomunitario. Operaciones corrientes (2)</field>
+            <field name="name">IVA Intracomunitario. Bienes (2)</field>
             <field name="description">IVA Intracomunitario (2)</field>
             <field name="parent" ref="iva_sop_intracomunitario"/>
             <field name="account" ref="pgc_0"/>
@@ -407,6 +458,29 @@ this repository contains the full copyright notices and license terms. -->
             <field name="invoice_account" ref="pgc_477"/>
             <field name="credit_note_account" ref="pgc_477"/>
         </record>
+        <record model="account.tax.template" id="iva_sop_intracomunitario_servicios_1">
+            <field name="name">IVA Intracomunitario. Servicios (1)</field>
+            <field name="description">IVA Intracomunitario (1)</field>
+            <field name="parent" ref="iva_sop_intracomunitario_servicios"/>
+            <field name="account" ref="pgc_0"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.21')"/>
+            <field name="invoice_account" ref="pgc_472"/>
+            <field name="credit_note_account" ref="pgc_472"/>
+            <field name="es_ec_purchases_list_code">I</field>
+        </record>
+        <record model="account.tax.template" id="iva_sop_intracomunitario_servicios_2">
+            <field name="name">IVA Intracomunitario. Servicios (2)</field>
+            <field name="description">IVA Intracomunitario (2)</field>
+            <field name="parent" ref="iva_sop_intracomunitario_servicios"/>
+            <field name="account" ref="pgc_0"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('-0.21')"/>
+            <field name="invoice_account" ref="pgc_477"/>
+            <field name="credit_note_account" ref="pgc_477"/>
+        </record>
         <record model="account.tax.template" id="iva_sop_intracomunitario_inv_1">
             <field name="name">IVA Intracomunitario. Bienes inversión (1)</field>
             <field name="description">IVA Intracomunitario (1)</field>
@@ -575,6 +649,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">base</field>
             <field name="type">credit</field>
         </record>
+        <record model="account.tax.code.line.template" id="vat_code_iva_devengado_base_intracomunitario-iva_sop_intracomunitario_servicios-invoice">
+            <field name="code" ref="vat_code_iva_devengado_base_intracomunitario"/>
+            <field name="tax" ref="iva_sop_intracomunitario_servicios_2"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record model="account.tax.code.line.template" id="vat_code_iva_devengado_base_intracomunitario-iva_sop_intracomunitario_servicios-credit">
+            <field name="code" ref="vat_code_iva_devengado_base_intracomunitario"/>
+            <field name="tax" ref="iva_sop_intracomunitario_servicios_2"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record model="account.tax.code.template" id="vat_code_iva_devengado_base_sujeto_pasivo">
             <field name="name">Otras operaciones con inversión del sujeto pasivo</field>
             <field name="code">12</field>
@@ -913,6 +1001,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">base</field>
             <field name="type">credit</field>
         </record>
+        <record model="account.tax.code.line.template" id="vat_code_iva_deducible_base_corrientes-iva_sop_21_servicios-invoice">
+            <field name="code" ref="vat_code_iva_deducible_base_corrientes"/>
+            <field name="tax" ref="iva_sop_21_servicios"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record model="account.tax.code.line.template" id="vat_code_iva_deducible_base_corrientes-iva_sop_21_servicios-credit">
+            <field name="code" ref="vat_code_iva_deducible_base_corrientes"/>
+            <field name="tax" ref="iva_sop_21_servicios"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record model="account.tax.code.line.template" id="vat_code_iva_deducible_base_corrientes-iva_sop_10-invoice">
             <field name="code" ref="vat_code_iva_deducible_base_corrientes"/>
             <field name="tax" ref="iva_sop_10"/>
@@ -927,6 +1029,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">base</field>
             <field name="type">credit</field>
         </record>
+        <record model="account.tax.code.line.template" id="vat_code_iva_deducible_base_corrientes-iva_sop_10_servicios-invoice">
+            <field name="code" ref="vat_code_iva_deducible_base_corrientes"/>
+            <field name="tax" ref="iva_sop_10_servicios"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record model="account.tax.code.line.template" id="vat_code_iva_deducible_base_corrientes-iva_sop_10_servicios-credit">
+            <field name="code" ref="vat_code_iva_deducible_base_corrientes"/>
+            <field name="tax" ref="iva_sop_10_servicios"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record model="account.tax.code.line.template" id="vat_code_iva_deducible_base_corrientes-iva_sop_4-invoice">
             <field name="code" ref="vat_code_iva_deducible_base_corrientes"/>
             <field name="tax" ref="iva_sop_4"/>
@@ -1027,6 +1143,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">base</field>
             <field name="type">credit</field>
         </record>
+        <record model="account.tax.code.line.template" id="vat_code_iva_deducible_base_importacion-iva_sop_importacion_servicios-invoice">
+            <field name="code" ref="vat_code_iva_deducible_base_importacion"/>
+            <field name="tax" ref="iva_sop_importacion_servicios"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record model="account.tax.code.line.template" id="vat_code_iva_deducible_base_importacion-iva_sop_importacion_servicios-credit">
+            <field name="code" ref="vat_code_iva_deducible_base_importacion"/>
+            <field name="tax" ref="iva_sop_importacion_servicios"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record model="account.tax.code.template" id="vat_code_iva_deducible_base_importacion_inversion">
             <field name="name">Importaciones de bienes de inversión</field>
             <field name="code">34</field>
@@ -1069,6 +1199,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">base</field>
             <field name="type">credit</field>
         </record>
+        <record model="account.tax.code.line.template" id="vat_code_iva_deducible_base_intracomunitario-iva_sop_intracomunitario_servicios-invoice">
+            <field name="code" ref="vat_code_iva_deducible_base_intracomunitario"/>
+            <field name="tax" ref="iva_sop_intracomunitario_servicios_1"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record model="account.tax.code.line.template" id="vat_code_iva_deducible_base_intracomunitario-iva_sop_intracomunitario_servicios-credit">
+            <field name="code" ref="vat_code_iva_deducible_base_intracomunitario"/>
+            <field name="tax" ref="iva_sop_intracomunitario_servicios_1"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record model="account.tax.code.template" id="vat_code_iva_deducible_base_intracomunitario_inv">
             <field name="name">Adquisiciones intracomunitario de bienes de inversión</field>
             <field name="code">38</field>
@@ -1816,6 +1960,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="tax" ref="iva_sop_ex"/>
             <field name="group" ref="tax_group_purchase"/>
         </record>
+        <record model="account.tax.rule.line.template" id="fptt_exento_purchase_service">
+            <field name="rule" ref="fp_exento"/>
+            <field name="tax" ref="iva_sop_ex_servicios"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+        </record>
         <record model="account.tax.rule.line.template" id="fptt_exento_purchase_investment">
             <field name="rule" ref="fp_exento"/>
             <field name="tax" ref="iva_sop_ex_inv"/>
@@ -1858,6 +2007,12 @@ this repository contains the full copyright notices and license terms. -->
             <field name="group" ref="tax_group_purchase"/>
         </record>
 
+        <record model="account.tax.rule.line.template" id="fptt_intra_purchase_service">
+            <field name="rule" ref="fp_intra_purchase"/>
+            <field name="tax" ref="iva_sop_intracomunitario_servicios"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+        </record>
+
         <record model="account.tax.rule.line.template" id="fptt_intra_purchase_investment">
             <field name="rule" ref="fp_intra_purchase"/>
             <field name="tax" ref="iva_sop_intracomunitario_inv"/>
@@ -1870,6 +2025,12 @@ this repository contains the full copyright notices and license terms. -->
             <field name="group" ref="tax_group_purchase"/>
         </record>
 
+        <record model="account.tax.rule.line.template" id="fptt_extra_purchase_service">
+            <field name="rule" ref="fp_intra_purchase"/>
+            <field name="tax" ref="iva_sop_importacion_servicios"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+        </record>
+
         <record model="account.tax.rule.line.template" id="fptt_extra_purchase_investment">
             <field name="rule" ref="fp_extra_purchase"/>
             <field name="tax" ref="iva_sop_importacion_inv"/>
diff --git a/tax_groups.xml b/tax_groups.xml
index 7c41983096..7f1f6d917c 100644
--- a/tax_groups.xml
+++ b/tax_groups.xml
@@ -14,8 +14,13 @@ this repository contains the full copyright notices and license terms. -->
             <field name="kind">sale</field>
         </record>
         <record model="account.tax.group" id="tax_group_purchase">
-            <field name="name">Compras</field>
-            <field name="code">Compras</field>
+            <field name="name">Compras de bienes</field>
+            <field name="code">Compras de bienes</field>
+            <field name="kind">purchase</field>
+        </record>
+        <record model="account.tax.group" id="tax_group_purchase_service">
+            <field name="name">Compras de servicios</field>
+            <field name="code">Compras de servicios</field>
             <field name="kind">purchase</field>
         </record>
         <record model="account.tax.group" id="tax_group_purchase_investment">
diff --git a/tax_normal.xml b/tax_normal.xml
index 8a1dfae838..a21758c0a6 100644
--- a/tax_normal.xml
+++ b/tax_normal.xml
@@ -155,7 +155,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="ec_sales_list_code">S</field>
         </record>
         <record id="iva_sop_21_normal" model="account.tax.template">
-            <field name="name">IVA 21% (operaciones corrientes)</field>
+            <field name="name">IVA 21% (bienes)</field>
             <field name="description">IVA 21%</field>
             <field name="account" ref="pgc_0_normal"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -165,8 +165,19 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_472_normal"/>
             <field name="es_vat_list_code">A</field>
         </record>
+        <record id="iva_sop_21_servicios_normal" model="account.tax.template">
+            <field name="name">IVA 21% (servicios)</field>
+            <field name="description">IVA 21%</field>
+            <field name="account" ref="pgc_0_normal"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.21')"/>
+            <field name="invoice_account" ref="pgc_472_normal"/>
+            <field name="credit_note_account" ref="pgc_472_normal"/>
+            <field name="es_vat_list_code">A</field>
+        </record>
         <record id="iva_sop_10_normal" model="account.tax.template">
-            <field name="name">IVA 10% (operaciones corrientes)</field>
+            <field name="name">IVA 10% (bienes)</field>
             <field name="description">IVA 10%</field>
             <field name="account" ref="pgc_0_normal"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -176,8 +187,19 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_472_normal"/>
             <field name="es_vat_list_code">A</field>
         </record>
+        <record id="iva_sop_10_servicios_normal" model="account.tax.template">
+            <field name="name">IVA 10% (servicios)</field>
+            <field name="description">IVA 10%</field>
+            <field name="account" ref="pgc_0_normal"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.1')"/>
+            <field name="invoice_account" ref="pgc_472_normal"/>
+            <field name="credit_note_account" ref="pgc_472_normal"/>
+            <field name="es_vat_list_code">A</field>
+        </record>
         <record id="iva_sop_4_normal" model="account.tax.template">
-            <field name="name">IVA 4% (operaciones corrientes)</field>
+            <field name="name">IVA 4% (bienes)</field>
             <field name="description">IVA 4%</field>
             <field name="account" ref="pgc_0_normal"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -188,7 +210,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="es_vat_list_code">A</field>
         </record>
         <record id="iva_sop_ex_normal" model="account.tax.template">
-            <field name="name">IVA Exento (operaciones corrientes)</field>
+            <field name="name">IVA Exento (bienes)</field>
             <field name="description">IVA Exento</field>
             <field name="account" ref="pgc_0_normal"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -197,6 +219,16 @@ this repository contains the full copyright notices and license terms. -->
             <field name="invoice_account" ref="pgc_4700_normal"/>
             <field name="credit_note_account" ref="pgc_4700_normal"/>
         </record>
+        <record id="iva_sop_ex_servicios_normal" model="account.tax.template">
+            <field name="name">IVA Exento (servicios)</field>
+            <field name="description">IVA Exento</field>
+            <field name="account" ref="pgc_0_normal"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.0')"/>
+            <field name="invoice_account" ref="pgc_4700_normal"/>
+            <field name="credit_note_account" ref="pgc_4700_normal"/>
+        </record>
         <record id="iva_sop_21_inv_normal" model="account.tax.template">
             <field name="name">IVA 21% (bienes de inversión)</field>
             <field name="description">IVA 21%</field>
@@ -241,7 +273,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_4700_normal"/>
         </record>
         <record id="iva_sop_importacion_normal" model="account.tax.template">
-            <field name="name">IVA Importaciones (operaciones corrientes)</field>
+            <field name="name">IVA Importaciones (bienes)</field>
             <field name="description">Importaciones</field>
             <field name="account" ref="pgc_0_normal"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -250,6 +282,16 @@ this repository contains the full copyright notices and license terms. -->
             <field name="invoice_account" ref="pgc_4700_normal"/>
             <field name="credit_note_account" ref="pgc_4700_normal"/>
         </record>
+        <record id="iva_sop_importacion_servicios_normal" model="account.tax.template">
+            <field name="name">IVA Importaciones (servicios)</field>
+            <field name="description">Importaciones</field>
+            <field name="account" ref="pgc_0_normal"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.0')"/>
+            <field name="invoice_account" ref="pgc_4700_normal"/>
+            <field name="credit_note_account" ref="pgc_4700_normal"/>
+        </record>
         <record id="iva_sop_importacion_inv_normal" model="account.tax.template">
             <field name="name">IVA Importaciones (bienes de inversión)</field>
             <field name="description">IVA Importaciones</field>
@@ -261,7 +303,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_4700_normal"/>
         </record>
         <record id="iva_sop_intracomunitario_normal" model="account.tax.template">
-            <field name="name">IVA Intracomunitario (operaciones corrientes)</field>
+            <field name="name">IVA Intracomunitario (bienes)</field>
             <field name="description">IVA Intracomunitario</field>
             <field name="account" ref="pgc_0_normal"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -269,6 +311,15 @@ this repository contains the full copyright notices and license terms. -->
             <field name="invoice_account" ref="pgc_4700_normal"/>
             <field name="credit_note_account" ref="pgc_4700_normal"/>
         </record>
+        <record id="iva_sop_intracomunitario_servicios_normal" model="account.tax.template">
+            <field name="name">IVA Intracomunitario (servicios)</field>
+            <field name="description">IVA Intracomunitario</field>
+            <field name="account" ref="pgc_0_normal"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">none</field>
+            <field name="invoice_account" ref="pgc_4700_normal"/>
+            <field name="credit_note_account" ref="pgc_4700_normal"/>
+        </record>
         <record id="iva_sop_intracomunitario_inv_normal" model="account.tax.template">
             <field name="name">IVA Intracomunitario (bienes de inversión)</field>
             <field name="description">IVA Intracomunitario</field>
@@ -385,7 +436,7 @@ this repository contains the full copyright notices and license terms. -->
     </data>
     <data grouped="1">
         <record id="iva_sop_intracomunitario_1_normal" model="account.tax.template">
-            <field name="name">IVA Intracomunitario. Operaciones corrientes (1)</field>
+            <field name="name">IVA Intracomunitario. Bienes (1)</field>
             <field name="description">IVA Intracomunitario (1)</field>
             <field name="parent" ref="iva_sop_intracomunitario_normal"/>
             <field name="account" ref="pgc_0_normal"/>
@@ -397,7 +448,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="es_ec_purchases_list_code">A</field>
         </record>
         <record id="iva_sop_intracomunitario_2_normal" model="account.tax.template">
-            <field name="name">IVA Intracomunitario. Operaciones corrientes (2)</field>
+            <field name="name">IVA Intracomunitario. Bienes (2)</field>
             <field name="description">IVA Intracomunitario (2)</field>
             <field name="parent" ref="iva_sop_intracomunitario_normal"/>
             <field name="account" ref="pgc_0_normal"/>
@@ -407,6 +458,29 @@ this repository contains the full copyright notices and license terms. -->
             <field name="invoice_account" ref="pgc_477_normal"/>
             <field name="credit_note_account" ref="pgc_477_normal"/>
         </record>
+        <record id="iva_sop_intracomunitario_servicios_1_normal" model="account.tax.template">
+            <field name="name">IVA Intracomunitario. Servicios (1)</field>
+            <field name="description">IVA Intracomunitario (1)</field>
+            <field name="parent" ref="iva_sop_intracomunitario_servicios_normal"/>
+            <field name="account" ref="pgc_0_normal"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.21')"/>
+            <field name="invoice_account" ref="pgc_472_normal"/>
+            <field name="credit_note_account" ref="pgc_472_normal"/>
+            <field name="es_ec_purchases_list_code">I</field>
+        </record>
+        <record id="iva_sop_intracomunitario_servicios_2_normal" model="account.tax.template">
+            <field name="name">IVA Intracomunitario. Servicios (2)</field>
+            <field name="description">IVA Intracomunitario (2)</field>
+            <field name="parent" ref="iva_sop_intracomunitario_servicios_normal"/>
+            <field name="account" ref="pgc_0_normal"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('-0.21')"/>
+            <field name="invoice_account" ref="pgc_477_normal"/>
+            <field name="credit_note_account" ref="pgc_477_normal"/>
+        </record>
         <record id="iva_sop_intracomunitario_inv_1_normal" model="account.tax.template">
             <field name="name">IVA Intracomunitario. Bienes inversión (1)</field>
             <field name="description">IVA Intracomunitario (1)</field>
@@ -575,6 +649,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">base</field>
             <field name="type">credit</field>
         </record>
+        <record id="vat_code_iva_devengado_base_intracomunitario-iva_sop_intracomunitario_servicios-invoice_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_base_intracomunitario_normal"/>
+            <field name="tax" ref="iva_sop_intracomunitario_servicios_2_normal"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_devengado_base_intracomunitario-iva_sop_intracomunitario_servicios-credit_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_base_intracomunitario_normal"/>
+            <field name="tax" ref="iva_sop_intracomunitario_servicios_2_normal"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_devengado_base_sujeto_pasivo_normal" model="account.tax.code.template">
             <field name="name">Otras operaciones con inversión del sujeto pasivo</field>
             <field name="code">12</field>
@@ -913,6 +1001,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">base</field>
             <field name="type">credit</field>
         </record>
+        <record id="vat_code_iva_deducible_base_corrientes-iva_sop_21_servicios-invoice_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_deducible_base_corrientes_normal"/>
+            <field name="tax" ref="iva_sop_21_servicios_normal"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_deducible_base_corrientes-iva_sop_21_servicios-credit_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_deducible_base_corrientes_normal"/>
+            <field name="tax" ref="iva_sop_21_servicios_normal"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_deducible_base_corrientes-iva_sop_10-invoice_normal" model="account.tax.code.line.template">
             <field name="code" ref="vat_code_iva_deducible_base_corrientes_normal"/>
             <field name="tax" ref="iva_sop_10_normal"/>
@@ -927,6 +1029,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">base</field>
             <field name="type">credit</field>
         </record>
+        <record id="vat_code_iva_deducible_base_corrientes-iva_sop_10_servicios-invoice_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_deducible_base_corrientes_normal"/>
+            <field name="tax" ref="iva_sop_10_servicios_normal"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_deducible_base_corrientes-iva_sop_10_servicios-credit_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_deducible_base_corrientes_normal"/>
+            <field name="tax" ref="iva_sop_10_servicios_normal"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_deducible_base_corrientes-iva_sop_4-invoice_normal" model="account.tax.code.line.template">
             <field name="code" ref="vat_code_iva_deducible_base_corrientes_normal"/>
             <field name="tax" ref="iva_sop_4_normal"/>
@@ -1027,6 +1143,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">base</field>
             <field name="type">credit</field>
         </record>
+        <record id="vat_code_iva_deducible_base_importacion-iva_sop_importacion_servicios-invoice_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_deducible_base_importacion_normal"/>
+            <field name="tax" ref="iva_sop_importacion_servicios_normal"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_deducible_base_importacion-iva_sop_importacion_servicios-credit_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_deducible_base_importacion_normal"/>
+            <field name="tax" ref="iva_sop_importacion_servicios_normal"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_deducible_base_importacion_inversion_normal" model="account.tax.code.template">
             <field name="name">Importaciones de bienes de inversión</field>
             <field name="code">34</field>
@@ -1069,6 +1199,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">base</field>
             <field name="type">credit</field>
         </record>
+        <record id="vat_code_iva_deducible_base_intracomunitario-iva_sop_intracomunitario_servicios-invoice_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_deducible_base_intracomunitario_normal"/>
+            <field name="tax" ref="iva_sop_intracomunitario_servicios_1_normal"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_deducible_base_intracomunitario-iva_sop_intracomunitario_servicios-credit_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_deducible_base_intracomunitario_normal"/>
+            <field name="tax" ref="iva_sop_intracomunitario_servicios_1_normal"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_deducible_base_intracomunitario_inv_normal" model="account.tax.code.template">
             <field name="name">Adquisiciones intracomunitario de bienes de inversión</field>
             <field name="code">38</field>
@@ -1816,6 +1960,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="tax" ref="iva_sop_ex_normal"/>
             <field name="group" ref="tax_group_purchase"/>
         </record>
+        <record id="fptt_exento_purchase_service_normal" model="account.tax.rule.line.template">
+            <field name="rule" ref="fp_exento_normal"/>
+            <field name="tax" ref="iva_sop_ex_servicios_normal"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+        </record>
         <record id="fptt_exento_purchase_investment_normal" model="account.tax.rule.line.template">
             <field name="rule" ref="fp_exento_normal"/>
             <field name="tax" ref="iva_sop_ex_inv_normal"/>
@@ -1858,6 +2007,12 @@ this repository contains the full copyright notices and license terms. -->
             <field name="group" ref="tax_group_purchase"/>
         </record>
 
+        <record id="fptt_intra_purchase_service_normal" model="account.tax.rule.line.template">
+            <field name="rule" ref="fp_intra_purchase_normal"/>
+            <field name="tax" ref="iva_sop_intracomunitario_servicios_normal"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+        </record>
+
         <record id="fptt_intra_purchase_investment_normal" model="account.tax.rule.line.template">
             <field name="rule" ref="fp_intra_purchase_normal"/>
             <field name="tax" ref="iva_sop_intracomunitario_inv_normal"/>
@@ -1870,6 +2025,12 @@ this repository contains the full copyright notices and license terms. -->
             <field name="group" ref="tax_group_purchase"/>
         </record>
 
+        <record id="fptt_extra_purchase_service_normal" model="account.tax.rule.line.template">
+            <field name="rule" ref="fp_intra_purchase_normal"/>
+            <field name="tax" ref="iva_sop_importacion_servicios_normal"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+        </record>
+
         <record id="fptt_extra_purchase_investment_normal" model="account.tax.rule.line.template">
             <field name="rule" ref="fp_extra_purchase_normal"/>
             <field name="tax" ref="iva_sop_importacion_inv_normal"/>
diff --git a/tax_pyme.xml b/tax_pyme.xml
index 789a7c7a99..07852a8c92 100644
--- a/tax_pyme.xml
+++ b/tax_pyme.xml
@@ -155,7 +155,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="ec_sales_list_code">S</field>
         </record>
         <record id="iva_sop_21_pyme" model="account.tax.template">
-            <field name="name">IVA 21% (operaciones corrientes)</field>
+            <field name="name">IVA 21% (bienes)</field>
             <field name="description">IVA 21%</field>
             <field name="account" ref="pgc_0_pyme"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -165,8 +165,19 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_472_pyme"/>
             <field name="es_vat_list_code">A</field>
         </record>
+        <record id="iva_sop_21_servicios_pyme" model="account.tax.template">
+            <field name="name">IVA 21% (servicios)</field>
+            <field name="description">IVA 21%</field>
+            <field name="account" ref="pgc_0_pyme"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.21')"/>
+            <field name="invoice_account" ref="pgc_472_pyme"/>
+            <field name="credit_note_account" ref="pgc_472_pyme"/>
+            <field name="es_vat_list_code">A</field>
+        </record>
         <record id="iva_sop_10_pyme" model="account.tax.template">
-            <field name="name">IVA 10% (operaciones corrientes)</field>
+            <field name="name">IVA 10% (bienes)</field>
             <field name="description">IVA 10%</field>
             <field name="account" ref="pgc_0_pyme"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -176,8 +187,19 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_472_pyme"/>
             <field name="es_vat_list_code">A</field>
         </record>
+        <record id="iva_sop_10_servicios_pyme" model="account.tax.template">
+            <field name="name">IVA 10% (servicios)</field>
+            <field name="description">IVA 10%</field>
+            <field name="account" ref="pgc_0_pyme"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.1')"/>
+            <field name="invoice_account" ref="pgc_472_pyme"/>
+            <field name="credit_note_account" ref="pgc_472_pyme"/>
+            <field name="es_vat_list_code">A</field>
+        </record>
         <record id="iva_sop_4_pyme" model="account.tax.template">
-            <field name="name">IVA 4% (operaciones corrientes)</field>
+            <field name="name">IVA 4% (bienes)</field>
             <field name="description">IVA 4%</field>
             <field name="account" ref="pgc_0_pyme"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -188,7 +210,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="es_vat_list_code">A</field>
         </record>
         <record id="iva_sop_ex_pyme" model="account.tax.template">
-            <field name="name">IVA Exento (operaciones corrientes)</field>
+            <field name="name">IVA Exento (bienes)</field>
             <field name="description">IVA Exento</field>
             <field name="account" ref="pgc_0_pyme"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -197,6 +219,16 @@ this repository contains the full copyright notices and license terms. -->
             <field name="invoice_account" ref="pgc_4700_pyme"/>
             <field name="credit_note_account" ref="pgc_4700_pyme"/>
         </record>
+        <record id="iva_sop_ex_servicios_pyme" model="account.tax.template">
+            <field name="name">IVA Exento (servicios)</field>
+            <field name="description">IVA Exento</field>
+            <field name="account" ref="pgc_0_pyme"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.0')"/>
+            <field name="invoice_account" ref="pgc_4700_pyme"/>
+            <field name="credit_note_account" ref="pgc_4700_pyme"/>
+        </record>
         <record id="iva_sop_21_inv_pyme" model="account.tax.template">
             <field name="name">IVA 21% (bienes de inversión)</field>
             <field name="description">IVA 21%</field>
@@ -241,7 +273,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_4700_pyme"/>
         </record>
         <record id="iva_sop_importacion_pyme" model="account.tax.template">
-            <field name="name">IVA Importaciones (operaciones corrientes)</field>
+            <field name="name">IVA Importaciones (bienes)</field>
             <field name="description">Importaciones</field>
             <field name="account" ref="pgc_0_pyme"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -250,6 +282,16 @@ this repository contains the full copyright notices and license terms. -->
             <field name="invoice_account" ref="pgc_4700_pyme"/>
             <field name="credit_note_account" ref="pgc_4700_pyme"/>
         </record>
+        <record id="iva_sop_importacion_servicios_pyme" model="account.tax.template">
+            <field name="name">IVA Importaciones (servicios)</field>
+            <field name="description">Importaciones</field>
+            <field name="account" ref="pgc_0_pyme"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.0')"/>
+            <field name="invoice_account" ref="pgc_4700_pyme"/>
+            <field name="credit_note_account" ref="pgc_4700_pyme"/>
+        </record>
         <record id="iva_sop_importacion_inv_pyme" model="account.tax.template">
             <field name="name">IVA Importaciones (bienes de inversión)</field>
             <field name="description">IVA Importaciones</field>
@@ -261,7 +303,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_4700_pyme"/>
         </record>
         <record id="iva_sop_intracomunitario_pyme" model="account.tax.template">
-            <field name="name">IVA Intracomunitario (operaciones corrientes)</field>
+            <field name="name">IVA Intracomunitario (bienes)</field>
             <field name="description">IVA Intracomunitario</field>
             <field name="account" ref="pgc_0_pyme"/>
             <field name="group" ref="tax_group_purchase"/>
@@ -269,6 +311,15 @@ this repository contains the full copyright notices and license terms. -->
             <field name="invoice_account" ref="pgc_4700_pyme"/>
             <field name="credit_note_account" ref="pgc_4700_pyme"/>
         </record>
+        <record id="iva_sop_intracomunitario_servicios_pyme" model="account.tax.template">
+            <field name="name">IVA Intracomunitario (servicios)</field>
+            <field name="description">IVA Intracomunitario</field>
+            <field name="account" ref="pgc_0_pyme"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">none</field>
+            <field name="invoice_account" ref="pgc_4700_pyme"/>
+            <field name="credit_note_account" ref="pgc_4700_pyme"/>
+        </record>
         <record id="iva_sop_intracomunitario_inv_pyme" model="account.tax.template">
             <field name="name">IVA Intracomunitario (bienes de inversión)</field>
             <field name="description">IVA Intracomunitario</field>
@@ -385,7 +436,7 @@ this repository contains the full copyright notices and license terms. -->
     </data>
     <data grouped="1">
         <record id="iva_sop_intracomunitario_1_pyme" model="account.tax.template">
-            <field name="name">IVA Intracomunitario. Operaciones corrientes (1)</field>
+            <field name="name">IVA Intracomunitario. Bienes (1)</field>
             <field name="description">IVA Intracomunitario (1)</field>
             <field name="parent" ref="iva_sop_intracomunitario_pyme"/>
             <field name="account" ref="pgc_0_pyme"/>
@@ -397,7 +448,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="es_ec_purchases_list_code">A</field>
         </record>
         <record id="iva_sop_intracomunitario_2_pyme" model="account.tax.template">
-            <field name="name">IVA Intracomunitario. Operaciones corrientes (2)</field>
+            <field name="name">IVA Intracomunitario. Bienes (2)</field>
             <field name="description">IVA Intracomunitario (2)</field>
             <field name="parent" ref="iva_sop_intracomunitario_pyme"/>
             <field name="account" ref="pgc_0_pyme"/>
@@ -407,6 +458,29 @@ this repository contains the full copyright notices and license terms. -->
             <field name="invoice_account" ref="pgc_477_pyme"/>
             <field name="credit_note_account" ref="pgc_477_pyme"/>
         </record>
+        <record id="iva_sop_intracomunitario_servicios_1_pyme" model="account.tax.template">
+            <field name="name">IVA Intracomunitario. Servicios (1)</field>
+            <field name="description">IVA Intracomunitario (1)</field>
+            <field name="parent" ref="iva_sop_intracomunitario_servicios_pyme"/>
+            <field name="account" ref="pgc_0_pyme"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.21')"/>
+            <field name="invoice_account" ref="pgc_472_pyme"/>
+            <field name="credit_note_account" ref="pgc_472_pyme"/>
+            <field name="es_ec_purchases_list_code">I</field>
+        </record>
+        <record id="iva_sop_intracomunitario_servicios_2_pyme" model="account.tax.template">
+            <field name="name">IVA Intracomunitario. Servicios (2)</field>
+            <field name="description">IVA Intracomunitario (2)</field>
+            <field name="parent" ref="iva_sop_intracomunitario_servicios_pyme"/>
+            <field name="account" ref="pgc_0_pyme"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('-0.21')"/>
+            <field name="invoice_account" ref="pgc_477_pyme"/>
+            <field name="credit_note_account" ref="pgc_477_pyme"/>
+        </record>
         <record id="iva_sop_intracomunitario_inv_1_pyme" model="account.tax.template">
             <field name="name">IVA Intracomunitario. Bienes inversión (1)</field>
             <field name="description">IVA Intracomunitario (1)</field>
@@ -575,6 +649,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">base</field>
             <field name="type">credit</field>
         </record>
+        <record id="vat_code_iva_devengado_base_intracomunitario-iva_sop_intracomunitario_servicios-invoice_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_base_intracomunitario_pyme"/>
+            <field name="tax" ref="iva_sop_intracomunitario_servicios_2_pyme"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_devengado_base_intracomunitario-iva_sop_intracomunitario_servicios-credit_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_base_intracomunitario_pyme"/>
+            <field name="tax" ref="iva_sop_intracomunitario_servicios_2_pyme"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_devengado_base_sujeto_pasivo_pyme" model="account.tax.code.template">
             <field name="name">Otras operaciones con inversión del sujeto pasivo</field>
             <field name="code">12</field>
@@ -913,6 +1001,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">base</field>
             <field name="type">credit</field>
         </record>
+        <record id="vat_code_iva_deducible_base_corrientes-iva_sop_21_servicios-invoice_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_deducible_base_corrientes_pyme"/>
+            <field name="tax" ref="iva_sop_21_servicios_pyme"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_deducible_base_corrientes-iva_sop_21_servicios-credit_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_deducible_base_corrientes_pyme"/>
+            <field name="tax" ref="iva_sop_21_servicios_pyme"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_deducible_base_corrientes-iva_sop_10-invoice_pyme" model="account.tax.code.line.template">
             <field name="code" ref="vat_code_iva_deducible_base_corrientes_pyme"/>
             <field name="tax" ref="iva_sop_10_pyme"/>
@@ -927,6 +1029,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">base</field>
             <field name="type">credit</field>
         </record>
+        <record id="vat_code_iva_deducible_base_corrientes-iva_sop_10_servicios-invoice_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_deducible_base_corrientes_pyme"/>
+            <field name="tax" ref="iva_sop_10_servicios_pyme"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_deducible_base_corrientes-iva_sop_10_servicios-credit_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_deducible_base_corrientes_pyme"/>
+            <field name="tax" ref="iva_sop_10_servicios_pyme"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_deducible_base_corrientes-iva_sop_4-invoice_pyme" model="account.tax.code.line.template">
             <field name="code" ref="vat_code_iva_deducible_base_corrientes_pyme"/>
             <field name="tax" ref="iva_sop_4_pyme"/>
@@ -1027,6 +1143,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">base</field>
             <field name="type">credit</field>
         </record>
+        <record id="vat_code_iva_deducible_base_importacion-iva_sop_importacion_servicios-invoice_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_deducible_base_importacion_pyme"/>
+            <field name="tax" ref="iva_sop_importacion_servicios_pyme"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_deducible_base_importacion-iva_sop_importacion_servicios-credit_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_deducible_base_importacion_pyme"/>
+            <field name="tax" ref="iva_sop_importacion_servicios_pyme"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_deducible_base_importacion_inversion_pyme" model="account.tax.code.template">
             <field name="name">Importaciones de bienes de inversión</field>
             <field name="code">34</field>
@@ -1069,6 +1199,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">base</field>
             <field name="type">credit</field>
         </record>
+        <record id="vat_code_iva_deducible_base_intracomunitario-iva_sop_intracomunitario_servicios-invoice_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_deducible_base_intracomunitario_pyme"/>
+            <field name="tax" ref="iva_sop_intracomunitario_servicios_1_pyme"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_deducible_base_intracomunitario-iva_sop_intracomunitario_servicios-credit_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_deducible_base_intracomunitario_pyme"/>
+            <field name="tax" ref="iva_sop_intracomunitario_servicios_1_pyme"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_deducible_base_intracomunitario_inv_pyme" model="account.tax.code.template">
             <field name="name">Adquisiciones intracomunitario de bienes de inversión</field>
             <field name="code">38</field>
@@ -1816,6 +1960,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="tax" ref="iva_sop_ex_pyme"/>
             <field name="group" ref="tax_group_purchase"/>
         </record>
+        <record id="fptt_exento_purchase_service_pyme" model="account.tax.rule.line.template">
+            <field name="rule" ref="fp_exento_pyme"/>
+            <field name="tax" ref="iva_sop_ex_servicios_pyme"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+        </record>
         <record id="fptt_exento_purchase_investment_pyme" model="account.tax.rule.line.template">
             <field name="rule" ref="fp_exento_pyme"/>
             <field name="tax" ref="iva_sop_ex_inv_pyme"/>
@@ -1858,6 +2007,12 @@ this repository contains the full copyright notices and license terms. -->
             <field name="group" ref="tax_group_purchase"/>
         </record>
 
+        <record id="fptt_intra_purchase_service_pyme" model="account.tax.rule.line.template">
+            <field name="rule" ref="fp_intra_purchase_pyme"/>
+            <field name="tax" ref="iva_sop_intracomunitario_servicios_pyme"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+        </record>
+
         <record id="fptt_intra_purchase_investment_pyme" model="account.tax.rule.line.template">
             <field name="rule" ref="fp_intra_purchase_pyme"/>
             <field name="tax" ref="iva_sop_intracomunitario_inv_pyme"/>
@@ -1870,6 +2025,12 @@ this repository contains the full copyright notices and license terms. -->
             <field name="group" ref="tax_group_purchase"/>
         </record>
 
+        <record id="fptt_extra_purchase_service_pyme" model="account.tax.rule.line.template">
+            <field name="rule" ref="fp_intra_purchase_pyme"/>
+            <field name="tax" ref="iva_sop_importacion_servicios_pyme"/>
+            <field name="group" ref="tax_group_purchase_service"/>
+        </record>
+
         <record id="fptt_extra_purchase_investment_pyme" model="account.tax.rule.line.template">
             <field name="rule" ref="fp_extra_purchase_pyme"/>
             <field name="tax" ref="iva_sop_importacion_inv_pyme"/>
diff --git a/tests/scenario_reporting.rst b/tests/scenario_reporting.rst
index 65be801da3..745ad4a202 100644
--- a/tests/scenario_reporting.rst
+++ b/tests/scenario_reporting.rst
@@ -90,11 +90,13 @@ Create account category::
     >>> Tax = Model.get('account.tax')
     >>> customer_tax, = Tax.find([
     ...     ('company', '=', company.id),
+    ...     ('group.kind', '=', 'sale'),
     ...     ('name', '=', 'IVA 21% (bienes)'),
     ...     ])
     >>> supplier_tax, = Tax.find([
     ...     ('company', '=', company.id),
-    ...     ('name', '=', 'IVA 21% (operaciones corrientes)'),
+    ...     ('group.kind', '=', 'purchase'),
+    ...     ('name', '=', 'IVA 21% (bienes)'),
     ...     ])
     >>> ProductCategory = Model.get('product.category')
     >>> account_category = ProductCategory(name="Account Category")
diff --git a/tests/scenario_reporting_cancelled_invoices.rst b/tests/scenario_reporting_cancelled_invoices.rst
index 120ee03f74..229f172c10 100644
--- a/tests/scenario_reporting_cancelled_invoices.rst
+++ b/tests/scenario_reporting_cancelled_invoices.rst
@@ -53,7 +53,8 @@ Create account category::
     >>> Tax = Model.get('account.tax')
     >>> supplier_tax, = Tax.find([
     ...     ('company', '=', company.id),
-    ...     ('name', '=', 'IVA 21% (operaciones corrientes)'),
+    ...     ('group.kind', '=', 'purchase'),
+    ...     ('name', '=', 'IVA 21% (bienes)'),
     ...     ])
     >>> ProductCategory = Model.get('product.category')
     >>> account_category = ProductCategory(name="Account Category")
diff --git a/tests/scenario_reporting_compensate.rst b/tests/scenario_reporting_compensate.rst
index 82806168c2..5712ae3f9c 100644
--- a/tests/scenario_reporting_compensate.rst
+++ b/tests/scenario_reporting_compensate.rst
@@ -56,6 +56,7 @@ Create account category::
     >>> Tax = Model.get('account.tax')
     >>> customer_tax, = Tax.find([
     ...     ('company', '=', company.id),
+    ...     ('group.kind', '=', 'sale'),
     ...     ('name', '=', 'IVA 21% (bienes)'),
     ...     ])
     >>> ProductCategory = Model.get('product.category')