diff --git a/CHANGELOG b/CHANGELOG
index d2ef3127a0..837c805bcb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Add sale service tax group
 * Use date filter in Spanish EC Operation list
 * Add Regimen especial agricultura, ganaderia y pesca tax rules
 * Allow requests for advancements on SEPA payments
diff --git a/tax.xml b/tax.xml
index 8da3c4da3c..9e65c19857 100644
--- a/tax.xml
+++ b/tax.xml
@@ -4,7 +4,7 @@ this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data grouped="1">
         <record model="account.tax.template" id="iva_rep_21">
-            <field name="name">IVA 21%</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_sale"/>
@@ -14,8 +14,19 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_477"/>
             <field name="es_vat_list_code">B</field>
         </record>
+        <record model="account.tax.template" id="iva_rep_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_sale_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"/>
+            <field name="es_vat_list_code">B</field>
+        </record>
         <record model="account.tax.template" id="iva_rep_10">
-            <field name="name">IVA 10%</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_sale"/>
@@ -25,6 +36,17 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_477"/>
             <field name="es_vat_list_code">B</field>
         </record>
+        <record model="account.tax.template" id="iva_rep_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_sale_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.1')"/>
+            <field name="invoice_account" ref="pgc_477"/>
+            <field name="credit_note_account" ref="pgc_477"/>
+            <field name="es_vat_list_code">B</field>
+        </record>
         <record model="account.tax.template" id="iva_rep_4">
             <field name="name">IVA 4%</field>
             <field name="description">IVA 4%</field>
@@ -37,7 +59,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="es_vat_list_code">B</field>
         </record>
         <record model="account.tax.template" id="iva_rep_ex">
-            <field name="name">IVA Exento</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_sale"/>
@@ -46,6 +68,16 @@ this repository contains the full copyright notices and license terms. -->
             <field name="invoice_account" ref="pgc_4750"/>
             <field name="credit_note_account" ref="pgc_4750"/>
         </record>
+        <record model="account.tax.template" id="iva_rep_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_sale_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.0')"/>
+            <field name="invoice_account" ref="pgc_4750"/>
+            <field name="credit_note_account" ref="pgc_4750"/>
+        </record>
         <record model="account.tax.template" id="iva_rep_re_52">
             <field name="name">Recargo equivalencia 5.2%</field>
             <field name="description">Recargo equivalencia 5.2%</field>
@@ -77,7 +109,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_477"/>
         </record>
         <record model="account.tax.template" id="iva_rep_exportaciones">
-            <field name="name">IVA Exportaciones</field>
+            <field name="name">IVA Exportaciones (bienes)</field>
             <field name="description">IVA Exportaciones</field>
             <field name="account" ref="pgc_0"/>
             <field name="group" ref="tax_group_sale"/>
@@ -87,8 +119,19 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_4750"/>
             <field name="legal_notice">Factura exenta en virtud del artículo 21 de la ley 37/1992 del impuesto Sobre el Valor Añadido.</field>
         </record>
+        <record model="account.tax.template" id="iva_rep_exportaciones_servicios">
+            <field name="name">IVA Exportaciones (servicios)</field>
+            <field name="description">IVA Exportaciones</field>
+            <field name="account" ref="pgc_0"/>
+            <field name="group" ref="tax_group_sale_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.0')"/>
+            <field name="invoice_account" ref="pgc_4750"/>
+            <field name="credit_note_account" ref="pgc_4750"/>
+            <field name="legal_notice">Factura exenta en virtud del artículo 21 de la ley 37/1992 del impuesto Sobre el Valor Añadido.</field>
+        </record>
         <record model="account.tax.template" id="iva_rep_intracomunitario_bienes">
-            <field name="name">IVA Intracomunitario (Bienes)</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_sale"/>
@@ -100,10 +143,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="ec_sales_list_code">E</field>
         </record>
         <record model="account.tax.template" id="iva_rep_intracomunitario_servicios">
-            <field name="name">IVA Intracomunitario (Servicios)</field>
+            <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_sale"/>
+            <field name="group" ref="tax_group_sale_service"/>
             <field name="type">percentage</field>
             <field name="rate" eval="Decimal('0.0')"/>
             <field name="invoice_account" ref="pgc_4750"/>
@@ -448,6 +491,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_red-iva_rep_10_servicios-invoice">
+            <field name="code" ref="vat_code_iva_devengado_base_red"/>
+            <field name="tax" ref="iva_rep_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_devengado_base_red-iva_rep_10_servicios-credit">
+            <field name="code" ref="vat_code_iva_devengado_base_red"/>
+            <field name="tax" ref="iva_rep_10_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_devengado_base_normal">
             <field name="name">IVA normal</field>
             <field name="code">07</field>
@@ -469,6 +526,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_normal-iva_rep_21_servicios-invoice">
+            <field name="code" ref="vat_code_iva_devengado_base_normal"/>
+            <field name="tax" ref="iva_rep_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_devengado_base_normal-iva_rep_21_servicios-credit">
+            <field name="code" ref="vat_code_iva_devengado_base_normal"/>
+            <field name="tax" ref="iva_rep_21_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_devengado_base_intracomunitario">
             <field name="name">Adquisiciones intracomunitarias de bienes y servicios</field>
             <field name="code">10</field>
@@ -639,6 +710,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">tax</field>
             <field name="type">credit</field>
         </record>
+        <record model="account.tax.code.line.template" id="vat_code_iva_devengado_tax_red-iva_rep_10_servicios-invoice">
+            <field name="code" ref="vat_code_iva_devengado_tax_red"/>
+            <field name="tax" ref="iva_rep_10_servicios"/>
+            <field name="operator">+</field>
+            <field name="amount">tax</field>
+            <field name="type">invoice</field>
+        </record>
+        <record model="account.tax.code.line.template" id="vat_code_iva_devengado_tax_red-iva_rep_10_servicios-credit">
+            <field name="code" ref="vat_code_iva_devengado_tax_red"/>
+            <field name="tax" ref="iva_rep_10_servicios"/>
+            <field name="operator">-</field>
+            <field name="amount">tax</field>
+            <field name="type">credit</field>
+        </record>
         <record model="account.tax.code.template" id="vat_code_iva_devengado_tax_normal">
             <field name="name">IVA normal</field>
             <field name="code">09</field>
@@ -660,6 +745,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">tax</field>
             <field name="type">credit</field>
         </record>
+        <record model="account.tax.code.line.template" id="vat_code_iva_devengado_tax_normal-iva_rep_21_servicios-invoice">
+            <field name="code" ref="vat_code_iva_devengado_tax_normal"/>
+            <field name="tax" ref="iva_rep_21_servicios"/>
+            <field name="operator">+</field>
+            <field name="amount">tax</field>
+            <field name="type">invoice</field>
+        </record>
+        <record model="account.tax.code.line.template" id="vat_code_iva_devengado_tax_normal-iva_rep_21_servicios-credit">
+            <field name="code" ref="vat_code_iva_devengado_tax_normal"/>
+            <field name="tax" ref="iva_rep_21_servicios"/>
+            <field name="operator">-</field>
+            <field name="amount">tax</field>
+            <field name="type">credit</field>
+        </record>
         <record model="account.tax.code.template" id="vat_code_iva_devengado_tax_intracomunitario">
             <field name="name">Adquisiciones intracomunitarias de bienes y servicios</field>
             <field name="code">11</field>
@@ -1290,6 +1389,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_exportaciones-iva_rep_exportaciones_servicios-invoice">
+            <field name="code" ref="vat_code_iva_exportaciones"/>
+            <field name="tax" ref="iva_rep_exportaciones_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_exportaciones-iva_rep_exportaciones_servicios-credit">
+            <field name="code" ref="vat_code_iva_exportaciones"/>
+            <field name="tax" ref="iva_rep_exportaciones_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_no_sujetas">
             <field name="name">Operaciones no sujetas o con inversión del sujeto pasivo que originen derecho a deducción</field>
             <field name="code">61</field>
@@ -1654,6 +1767,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="account" ref="pgc_0"/>
             <field name="kind">sale</field>
         </record>
+        <record model="account.tax.rule.template" id="fp_intra_sale">
+            <field name="name">Ventas Intracomunitarias</field>
+            <field name="account" ref="pgc_0"/>
+            <field name="kind">sale</field>
+        </record>
         <record model="account.tax.rule.template" id="fp_extra_sale">
             <field name="name">Ventas Extracomunitarias</field>
             <field name="account" ref="pgc_0"/>
@@ -1708,6 +1826,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="tax" ref="iva_rep_ex"/>
             <field name="group" ref="tax_group_sale"/>
         </record>
+        <record model="account.tax.rule.line.template" id="fptt_exento_sale_service">
+            <field name="rule" ref="fp_exento"/>
+            <field name="tax" ref="iva_rep_ex_servicios"/>
+            <field name="group" ref="tax_group_sale_service"/>
+        </record>
 
         <record model="account.tax.rule.line.template" id="fp_line_irpf_19_purchase_rent">
             <field name="rule" ref="fp_irpf_purchase_rent"/>
@@ -1758,12 +1881,30 @@ this repository contains the full copyright notices and license terms. -->
             <field name="tax" ref="irpf_7_sale"/>
         </record>
 
+        <record model="account.tax.rule.line.template" id="fptt_intra_sale">
+            <field name="rule" ref="fp_intra_sale"/>
+            <field name="tax" ref="iva_rep_intracomunitario_bienes"/>
+            <field name="group" ref="tax_group_sale"/>
+        </record>
+
+        <record model="account.tax.rule.line.template" id="fptt_intra_sale_service">
+            <field name="rule" ref="fp_intra_sale"/>
+            <field name="tax" ref="iva_rep_intracomunitario_servicios"/>
+            <field name="group" ref="tax_group_sale_service"/>
+        </record>
+
         <record model="account.tax.rule.line.template" id="fptt_extra_sale">
             <field name="rule" ref="fp_extra_sale"/>
             <field name="tax" ref="iva_rep_exportaciones"/>
             <field name="group" ref="tax_group_sale"/>
         </record>
 
+        <record model="account.tax.rule.line.template" id="fptt_extra_sale_service">
+            <field name="rule" ref="fp_extra_sale"/>
+            <field name="tax" ref="iva_rep_exportaciones_servicios"/>
+            <field name="group" ref="tax_group_sale_service"/>
+        </record>
+
         <record model="account.tax.rule.line.template" id="fp_reaf_iva">
             <field name="rule" ref="fp_reaf"/>
             <field name="tax" ref="iva_reagp_12"/>
diff --git a/tax_groups.xml b/tax_groups.xml
index 33b7bc1b60..7c41983096 100644
--- a/tax_groups.xml
+++ b/tax_groups.xml
@@ -4,8 +4,13 @@ this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data grouped="1">
         <record model="account.tax.group" id="tax_group_sale">
-            <field name="name">Ventas</field>
-            <field name="code">Ventas</field>
+            <field name="name">Ventas de bienes</field>
+            <field name="code">Ventas de bienes</field>
+            <field name="kind">sale</field>
+        </record>
+        <record model="account.tax.group" id="tax_group_sale_service">
+            <field name="name">Ventas de servicios</field>
+            <field name="code">Ventas de servicios</field>
             <field name="kind">sale</field>
         </record>
         <record model="account.tax.group" id="tax_group_purchase">
diff --git a/tax_normal.xml b/tax_normal.xml
index d989a47a00..8a1dfae838 100644
--- a/tax_normal.xml
+++ b/tax_normal.xml
@@ -4,7 +4,7 @@ this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data grouped="1">
         <record id="iva_rep_21_normal" model="account.tax.template">
-            <field name="name">IVA 21%</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_sale"/>
@@ -14,8 +14,19 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_477_normal"/>
             <field name="es_vat_list_code">B</field>
         </record>
+        <record id="iva_rep_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_sale_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"/>
+            <field name="es_vat_list_code">B</field>
+        </record>
         <record id="iva_rep_10_normal" model="account.tax.template">
-            <field name="name">IVA 10%</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_sale"/>
@@ -25,6 +36,17 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_477_normal"/>
             <field name="es_vat_list_code">B</field>
         </record>
+        <record id="iva_rep_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_sale_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.1')"/>
+            <field name="invoice_account" ref="pgc_477_normal"/>
+            <field name="credit_note_account" ref="pgc_477_normal"/>
+            <field name="es_vat_list_code">B</field>
+        </record>
         <record id="iva_rep_4_normal" model="account.tax.template">
             <field name="name">IVA 4%</field>
             <field name="description">IVA 4%</field>
@@ -37,7 +59,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="es_vat_list_code">B</field>
         </record>
         <record id="iva_rep_ex_normal" model="account.tax.template">
-            <field name="name">IVA Exento</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_sale"/>
@@ -46,6 +68,16 @@ this repository contains the full copyright notices and license terms. -->
             <field name="invoice_account" ref="pgc_4750_normal"/>
             <field name="credit_note_account" ref="pgc_4750_normal"/>
         </record>
+        <record id="iva_rep_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_sale_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.0')"/>
+            <field name="invoice_account" ref="pgc_4750_normal"/>
+            <field name="credit_note_account" ref="pgc_4750_normal"/>
+        </record>
         <record id="iva_rep_re_52_normal" model="account.tax.template">
             <field name="name">Recargo equivalencia 5.2%</field>
             <field name="description">Recargo equivalencia 5.2%</field>
@@ -77,7 +109,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_477_normal"/>
         </record>
         <record id="iva_rep_exportaciones_normal" model="account.tax.template">
-            <field name="name">IVA Exportaciones</field>
+            <field name="name">IVA Exportaciones (bienes)</field>
             <field name="description">IVA Exportaciones</field>
             <field name="account" ref="pgc_0_normal"/>
             <field name="group" ref="tax_group_sale"/>
@@ -87,8 +119,19 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_4750_normal"/>
             <field name="legal_notice">Factura exenta en virtud del artículo 21 de la ley 37/1992 del impuesto Sobre el Valor Añadido.</field>
         </record>
+        <record id="iva_rep_exportaciones_servicios_normal" model="account.tax.template">
+            <field name="name">IVA Exportaciones (servicios)</field>
+            <field name="description">IVA Exportaciones</field>
+            <field name="account" ref="pgc_0_normal"/>
+            <field name="group" ref="tax_group_sale_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.0')"/>
+            <field name="invoice_account" ref="pgc_4750_normal"/>
+            <field name="credit_note_account" ref="pgc_4750_normal"/>
+            <field name="legal_notice">Factura exenta en virtud del artículo 21 de la ley 37/1992 del impuesto Sobre el Valor Añadido.</field>
+        </record>
         <record id="iva_rep_intracomunitario_bienes_normal" model="account.tax.template">
-            <field name="name">IVA Intracomunitario (Bienes)</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_sale"/>
@@ -100,10 +143,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="ec_sales_list_code">E</field>
         </record>
         <record id="iva_rep_intracomunitario_servicios_normal" model="account.tax.template">
-            <field name="name">IVA Intracomunitario (Servicios)</field>
+            <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_sale"/>
+            <field name="group" ref="tax_group_sale_service"/>
             <field name="type">percentage</field>
             <field name="rate" eval="Decimal('0.0')"/>
             <field name="invoice_account" ref="pgc_4750_normal"/>
@@ -448,6 +491,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_red-iva_rep_10_servicios-invoice_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_base_red_normal"/>
+            <field name="tax" ref="iva_rep_10_servicios_normal"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_devengado_base_red-iva_rep_10_servicios-credit_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_base_red_normal"/>
+            <field name="tax" ref="iva_rep_10_servicios_normal"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_devengado_base_normal_normal" model="account.tax.code.template">
             <field name="name">IVA normal</field>
             <field name="code">07</field>
@@ -469,6 +526,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_normal-iva_rep_21_servicios-invoice_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_base_normal_normal"/>
+            <field name="tax" ref="iva_rep_21_servicios_normal"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_devengado_base_normal-iva_rep_21_servicios-credit_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_base_normal_normal"/>
+            <field name="tax" ref="iva_rep_21_servicios_normal"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_devengado_base_intracomunitario_normal" model="account.tax.code.template">
             <field name="name">Adquisiciones intracomunitarias de bienes y servicios</field>
             <field name="code">10</field>
@@ -639,6 +710,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">tax</field>
             <field name="type">credit</field>
         </record>
+        <record id="vat_code_iva_devengado_tax_red-iva_rep_10_servicios-invoice_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_tax_red_normal"/>
+            <field name="tax" ref="iva_rep_10_servicios_normal"/>
+            <field name="operator">+</field>
+            <field name="amount">tax</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_devengado_tax_red-iva_rep_10_servicios-credit_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_tax_red_normal"/>
+            <field name="tax" ref="iva_rep_10_servicios_normal"/>
+            <field name="operator">-</field>
+            <field name="amount">tax</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_devengado_tax_normal_normal" model="account.tax.code.template">
             <field name="name">IVA normal</field>
             <field name="code">09</field>
@@ -660,6 +745,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">tax</field>
             <field name="type">credit</field>
         </record>
+        <record id="vat_code_iva_devengado_tax_normal-iva_rep_21_servicios-invoice_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_tax_normal_normal"/>
+            <field name="tax" ref="iva_rep_21_servicios_normal"/>
+            <field name="operator">+</field>
+            <field name="amount">tax</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_devengado_tax_normal-iva_rep_21_servicios-credit_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_tax_normal_normal"/>
+            <field name="tax" ref="iva_rep_21_servicios_normal"/>
+            <field name="operator">-</field>
+            <field name="amount">tax</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_devengado_tax_intracomunitario_normal" model="account.tax.code.template">
             <field name="name">Adquisiciones intracomunitarias de bienes y servicios</field>
             <field name="code">11</field>
@@ -1290,6 +1389,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_exportaciones-iva_rep_exportaciones_servicios-invoice_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_exportaciones_normal"/>
+            <field name="tax" ref="iva_rep_exportaciones_servicios_normal"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_exportaciones-iva_rep_exportaciones_servicios-credit_normal" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_exportaciones_normal"/>
+            <field name="tax" ref="iva_rep_exportaciones_servicios_normal"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_no_sujetas_normal" model="account.tax.code.template">
             <field name="name">Operaciones no sujetas o con inversión del sujeto pasivo que originen derecho a deducción</field>
             <field name="code">61</field>
@@ -1654,6 +1767,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="account" ref="pgc_0_normal"/>
             <field name="kind">sale</field>
         </record>
+        <record id="fp_intra_sale_normal" model="account.tax.rule.template">
+            <field name="name">Ventas Intracomunitarias</field>
+            <field name="account" ref="pgc_0_normal"/>
+            <field name="kind">sale</field>
+        </record>
         <record id="fp_extra_sale_normal" model="account.tax.rule.template">
             <field name="name">Ventas Extracomunitarias</field>
             <field name="account" ref="pgc_0_normal"/>
@@ -1708,6 +1826,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="tax" ref="iva_rep_ex_normal"/>
             <field name="group" ref="tax_group_sale"/>
         </record>
+        <record id="fptt_exento_sale_service_normal" model="account.tax.rule.line.template">
+            <field name="rule" ref="fp_exento_normal"/>
+            <field name="tax" ref="iva_rep_ex_servicios_normal"/>
+            <field name="group" ref="tax_group_sale_service"/>
+        </record>
 
         <record id="fp_line_irpf_19_purchase_rent_normal" model="account.tax.rule.line.template">
             <field name="rule" ref="fp_irpf_purchase_rent_normal"/>
@@ -1758,12 +1881,30 @@ this repository contains the full copyright notices and license terms. -->
             <field name="tax" ref="irpf_7_sale_normal"/>
         </record>
 
+        <record id="fptt_intra_sale_normal" model="account.tax.rule.line.template">
+            <field name="rule" ref="fp_intra_sale_normal"/>
+            <field name="tax" ref="iva_rep_intracomunitario_bienes_normal"/>
+            <field name="group" ref="tax_group_sale"/>
+        </record>
+
+        <record id="fptt_intra_sale_service_normal" model="account.tax.rule.line.template">
+            <field name="rule" ref="fp_intra_sale_normal"/>
+            <field name="tax" ref="iva_rep_intracomunitario_servicios_normal"/>
+            <field name="group" ref="tax_group_sale_service"/>
+        </record>
+
         <record id="fptt_extra_sale_normal" model="account.tax.rule.line.template">
             <field name="rule" ref="fp_extra_sale_normal"/>
             <field name="tax" ref="iva_rep_exportaciones_normal"/>
             <field name="group" ref="tax_group_sale"/>
         </record>
 
+        <record id="fptt_extra_sale_service_normal" model="account.tax.rule.line.template">
+            <field name="rule" ref="fp_extra_sale_normal"/>
+            <field name="tax" ref="iva_rep_exportaciones_servicios_normal"/>
+            <field name="group" ref="tax_group_sale_service"/>
+        </record>
+
         <record id="fp_reaf_iva_normal" model="account.tax.rule.line.template">
             <field name="rule" ref="fp_reaf_normal"/>
             <field name="tax" ref="iva_reagp_12_normal"/>
diff --git a/tax_pyme.xml b/tax_pyme.xml
index 3af2921da4..789a7c7a99 100644
--- a/tax_pyme.xml
+++ b/tax_pyme.xml
@@ -4,7 +4,7 @@ this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data grouped="1">
         <record id="iva_rep_21_pyme" model="account.tax.template">
-            <field name="name">IVA 21%</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_sale"/>
@@ -14,8 +14,19 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_477_pyme"/>
             <field name="es_vat_list_code">B</field>
         </record>
+        <record id="iva_rep_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_sale_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"/>
+            <field name="es_vat_list_code">B</field>
+        </record>
         <record id="iva_rep_10_pyme" model="account.tax.template">
-            <field name="name">IVA 10%</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_sale"/>
@@ -25,6 +36,17 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_477_pyme"/>
             <field name="es_vat_list_code">B</field>
         </record>
+        <record id="iva_rep_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_sale_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.1')"/>
+            <field name="invoice_account" ref="pgc_477_pyme"/>
+            <field name="credit_note_account" ref="pgc_477_pyme"/>
+            <field name="es_vat_list_code">B</field>
+        </record>
         <record id="iva_rep_4_pyme" model="account.tax.template">
             <field name="name">IVA 4%</field>
             <field name="description">IVA 4%</field>
@@ -37,7 +59,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="es_vat_list_code">B</field>
         </record>
         <record id="iva_rep_ex_pyme" model="account.tax.template">
-            <field name="name">IVA Exento</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_sale"/>
@@ -46,6 +68,16 @@ this repository contains the full copyright notices and license terms. -->
             <field name="invoice_account" ref="pgc_4750_pyme"/>
             <field name="credit_note_account" ref="pgc_4750_pyme"/>
         </record>
+        <record id="iva_rep_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_sale_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.0')"/>
+            <field name="invoice_account" ref="pgc_4750_pyme"/>
+            <field name="credit_note_account" ref="pgc_4750_pyme"/>
+        </record>
         <record id="iva_rep_re_52_pyme" model="account.tax.template">
             <field name="name">Recargo equivalencia 5.2%</field>
             <field name="description">Recargo equivalencia 5.2%</field>
@@ -77,7 +109,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_477_pyme"/>
         </record>
         <record id="iva_rep_exportaciones_pyme" model="account.tax.template">
-            <field name="name">IVA Exportaciones</field>
+            <field name="name">IVA Exportaciones (bienes)</field>
             <field name="description">IVA Exportaciones</field>
             <field name="account" ref="pgc_0_pyme"/>
             <field name="group" ref="tax_group_sale"/>
@@ -87,8 +119,19 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_4750_pyme"/>
             <field name="legal_notice">Factura exenta en virtud del artículo 21 de la ley 37/1992 del impuesto Sobre el Valor Añadido.</field>
         </record>
+        <record id="iva_rep_exportaciones_servicios_pyme" model="account.tax.template">
+            <field name="name">IVA Exportaciones (servicios)</field>
+            <field name="description">IVA Exportaciones</field>
+            <field name="account" ref="pgc_0_pyme"/>
+            <field name="group" ref="tax_group_sale_service"/>
+            <field name="type">percentage</field>
+            <field name="rate" eval="Decimal('0.0')"/>
+            <field name="invoice_account" ref="pgc_4750_pyme"/>
+            <field name="credit_note_account" ref="pgc_4750_pyme"/>
+            <field name="legal_notice">Factura exenta en virtud del artículo 21 de la ley 37/1992 del impuesto Sobre el Valor Añadido.</field>
+        </record>
         <record id="iva_rep_intracomunitario_bienes_pyme" model="account.tax.template">
-            <field name="name">IVA Intracomunitario (Bienes)</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_sale"/>
@@ -100,10 +143,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="ec_sales_list_code">E</field>
         </record>
         <record id="iva_rep_intracomunitario_servicios_pyme" model="account.tax.template">
-            <field name="name">IVA Intracomunitario (Servicios)</field>
+            <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_sale"/>
+            <field name="group" ref="tax_group_sale_service"/>
             <field name="type">percentage</field>
             <field name="rate" eval="Decimal('0.0')"/>
             <field name="invoice_account" ref="pgc_4750_pyme"/>
@@ -448,6 +491,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_red-iva_rep_10_servicios-invoice_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_base_red_pyme"/>
+            <field name="tax" ref="iva_rep_10_servicios_pyme"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_devengado_base_red-iva_rep_10_servicios-credit_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_base_red_pyme"/>
+            <field name="tax" ref="iva_rep_10_servicios_pyme"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_devengado_base_normal_pyme" model="account.tax.code.template">
             <field name="name">IVA normal</field>
             <field name="code">07</field>
@@ -469,6 +526,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_normal-iva_rep_21_servicios-invoice_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_base_normal_pyme"/>
+            <field name="tax" ref="iva_rep_21_servicios_pyme"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_devengado_base_normal-iva_rep_21_servicios-credit_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_base_normal_pyme"/>
+            <field name="tax" ref="iva_rep_21_servicios_pyme"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_devengado_base_intracomunitario_pyme" model="account.tax.code.template">
             <field name="name">Adquisiciones intracomunitarias de bienes y servicios</field>
             <field name="code">10</field>
@@ -639,6 +710,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">tax</field>
             <field name="type">credit</field>
         </record>
+        <record id="vat_code_iva_devengado_tax_red-iva_rep_10_servicios-invoice_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_tax_red_pyme"/>
+            <field name="tax" ref="iva_rep_10_servicios_pyme"/>
+            <field name="operator">+</field>
+            <field name="amount">tax</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_devengado_tax_red-iva_rep_10_servicios-credit_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_tax_red_pyme"/>
+            <field name="tax" ref="iva_rep_10_servicios_pyme"/>
+            <field name="operator">-</field>
+            <field name="amount">tax</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_devengado_tax_normal_pyme" model="account.tax.code.template">
             <field name="name">IVA normal</field>
             <field name="code">09</field>
@@ -660,6 +745,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="amount">tax</field>
             <field name="type">credit</field>
         </record>
+        <record id="vat_code_iva_devengado_tax_normal-iva_rep_21_servicios-invoice_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_tax_normal_pyme"/>
+            <field name="tax" ref="iva_rep_21_servicios_pyme"/>
+            <field name="operator">+</field>
+            <field name="amount">tax</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_devengado_tax_normal-iva_rep_21_servicios-credit_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_devengado_tax_normal_pyme"/>
+            <field name="tax" ref="iva_rep_21_servicios_pyme"/>
+            <field name="operator">-</field>
+            <field name="amount">tax</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_devengado_tax_intracomunitario_pyme" model="account.tax.code.template">
             <field name="name">Adquisiciones intracomunitarias de bienes y servicios</field>
             <field name="code">11</field>
@@ -1290,6 +1389,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_exportaciones-iva_rep_exportaciones_servicios-invoice_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_exportaciones_pyme"/>
+            <field name="tax" ref="iva_rep_exportaciones_servicios_pyme"/>
+            <field name="operator">+</field>
+            <field name="amount">base</field>
+            <field name="type">invoice</field>
+        </record>
+        <record id="vat_code_iva_exportaciones-iva_rep_exportaciones_servicios-credit_pyme" model="account.tax.code.line.template">
+            <field name="code" ref="vat_code_iva_exportaciones_pyme"/>
+            <field name="tax" ref="iva_rep_exportaciones_servicios_pyme"/>
+            <field name="operator">-</field>
+            <field name="amount">base</field>
+            <field name="type">credit</field>
+        </record>
         <record id="vat_code_iva_no_sujetas_pyme" model="account.tax.code.template">
             <field name="name">Operaciones no sujetas o con inversión del sujeto pasivo que originen derecho a deducción</field>
             <field name="code">61</field>
@@ -1654,6 +1767,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="account" ref="pgc_0_pyme"/>
             <field name="kind">sale</field>
         </record>
+        <record id="fp_intra_sale_pyme" model="account.tax.rule.template">
+            <field name="name">Ventas Intracomunitarias</field>
+            <field name="account" ref="pgc_0_pyme"/>
+            <field name="kind">sale</field>
+        </record>
         <record id="fp_extra_sale_pyme" model="account.tax.rule.template">
             <field name="name">Ventas Extracomunitarias</field>
             <field name="account" ref="pgc_0_pyme"/>
@@ -1708,6 +1826,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="tax" ref="iva_rep_ex_pyme"/>
             <field name="group" ref="tax_group_sale"/>
         </record>
+        <record id="fptt_exento_sale_service_pyme" model="account.tax.rule.line.template">
+            <field name="rule" ref="fp_exento_pyme"/>
+            <field name="tax" ref="iva_rep_ex_servicios_pyme"/>
+            <field name="group" ref="tax_group_sale_service"/>
+        </record>
 
         <record id="fp_line_irpf_19_purchase_rent_pyme" model="account.tax.rule.line.template">
             <field name="rule" ref="fp_irpf_purchase_rent_pyme"/>
@@ -1758,12 +1881,30 @@ this repository contains the full copyright notices and license terms. -->
             <field name="tax" ref="irpf_7_sale_pyme"/>
         </record>
 
+        <record id="fptt_intra_sale_pyme" model="account.tax.rule.line.template">
+            <field name="rule" ref="fp_intra_sale_pyme"/>
+            <field name="tax" ref="iva_rep_intracomunitario_bienes_pyme"/>
+            <field name="group" ref="tax_group_sale"/>
+        </record>
+
+        <record id="fptt_intra_sale_service_pyme" model="account.tax.rule.line.template">
+            <field name="rule" ref="fp_intra_sale_pyme"/>
+            <field name="tax" ref="iva_rep_intracomunitario_servicios_pyme"/>
+            <field name="group" ref="tax_group_sale_service"/>
+        </record>
+
         <record id="fptt_extra_sale_pyme" model="account.tax.rule.line.template">
             <field name="rule" ref="fp_extra_sale_pyme"/>
             <field name="tax" ref="iva_rep_exportaciones_pyme"/>
             <field name="group" ref="tax_group_sale"/>
         </record>
 
+        <record id="fptt_extra_sale_service_pyme" model="account.tax.rule.line.template">
+            <field name="rule" ref="fp_extra_sale_pyme"/>
+            <field name="tax" ref="iva_rep_exportaciones_servicios_pyme"/>
+            <field name="group" ref="tax_group_sale_service"/>
+        </record>
+
         <record id="fp_reaf_iva_pyme" model="account.tax.rule.line.template">
             <field name="rule" ref="fp_reaf_pyme"/>
             <field name="tax" ref="iva_reagp_12_pyme"/>