From 5ad6101b49fbb2f0ced7829237a74f943b7b8db0 Mon Sep 17 00:00:00 2001
From: Sergi Almacellas Abellana <sergi@koolpi.com>
Date: Fri, 9 Apr 2021 15:58:38 +0200
Subject: [PATCH] Set vat list code on recargo and exempt taxes

Exclude reported_with base amounts to avoid duplication

issue10213
review341961002
---
 reporting_tax.py |  3 +++
 tax.xml          | 10 ++++++++++
 tax_normal.xml   | 10 ++++++++++
 tax_pyme.xml     | 10 ++++++++++
 4 files changed, 33 insertions(+)

diff --git a/reporting_tax.py b/reporting_tax.py
index 8b2f087a19..93f182f9ea 100644
--- a/reporting_tax.py
+++ b/reporting_tax.py
@@ -452,6 +452,9 @@ class ESVATList(ModelSQL, ModelView):
             & (tax.es_vat_list_code != Null)
             & (Extract('year', invoice.invoice_date)
                 == context.get('date', Date.today()).year)
+            # Exclude base amount for es_reported_with taxes because it is
+            # already included in the base of main tax
+            & ((tax.es_reported_with == Null) | (tax_line.type == 'tax'))
             & ~Exists(cancel_invoice.select(
                     cancel_invoice.cancel_move, distinct=True,
                     where=(cancel_invoice.cancel_move == invoice.move)))
diff --git a/tax.xml b/tax.xml
index 0c600bd0fd..716b45542d 100644
--- a/tax.xml
+++ b/tax.xml
@@ -67,6 +67,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="rate" eval="Decimal('0.0')"/>
             <field name="invoice_account" ref="pgc_4750"/>
             <field name="credit_note_account" ref="pgc_4750"/>
+            <field name="es_vat_list_code">B</field>
         </record>
         <record model="account.tax.template" id="iva_rep_ex_servicios">
             <field name="name">IVA Exento (servicios)</field>
@@ -77,6 +78,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="rate" eval="Decimal('0.0')"/>
             <field name="invoice_account" ref="pgc_4750"/>
             <field name="credit_note_account" ref="pgc_4750"/>
+            <field name="es_vat_list_code">B</field>
         </record>
         <record model="account.tax.template" id="iva_rep_re_52">
             <field name="name">Recargo equivalencia 5.2%</field>
@@ -88,6 +90,7 @@ 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"/>
             <field name="es_reported_with" ref="iva_rep_21"/>
+            <field name="es_vat_list_code">B</field>
         </record>
         <record model="account.tax.template" id="iva_rep_re_14">
             <field name="name">Recargo Equivalencia 1.4%</field>
@@ -99,6 +102,7 @@ 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"/>
             <field name="es_reported_with" ref="iva_rep_10"/>
+            <field name="es_vat_list_code">B</field>
         </record>
         <record model="account.tax.template" id="iva_rep_re_05">
             <field name="name">Recargo Equivalencia 0.5%</field>
@@ -110,6 +114,7 @@ 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"/>
             <field name="es_reported_with" ref="iva_rep_4"/>
+            <field name="es_vat_list_code">B</field>
         </record>
         <record model="account.tax.template" id="iva_rep_exportaciones">
             <field name="name">IVA Exportaciones (bienes)</field>
@@ -221,6 +226,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="rate" eval="Decimal('0.0')"/>
             <field name="invoice_account" ref="pgc_4700"/>
             <field name="credit_note_account" ref="pgc_4700"/>
+            <field name="es_vat_list_code">A</field>
         </record>
         <record model="account.tax.template" id="iva_sop_ex_servicios">
             <field name="name">IVA Exento (servicios)</field>
@@ -231,6 +237,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="rate" eval="Decimal('0.0')"/>
             <field name="invoice_account" ref="pgc_4700"/>
             <field name="credit_note_account" ref="pgc_4700"/>
+            <field name="es_vat_list_code">A</field>
         </record>
         <record model="account.tax.template" id="iva_sop_21_inv">
             <field name="name">IVA 21% (bienes de inversión)</field>
@@ -274,6 +281,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="rate" eval="Decimal('0.0')"/>
             <field name="invoice_account" ref="pgc_4700"/>
             <field name="credit_note_account" ref="pgc_4700"/>
+            <field name="es_vat_list_code">A</field>
         </record>
         <record model="account.tax.template" id="iva_sop_importacion">
             <field name="name">IVA Importaciones (bienes)</field>
@@ -423,6 +431,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_472"/>
             <field name="update_unit_price" eval="True"/>
             <field name="sequence" eval="10"/>
+            <field name="es_vat_list_code">A</field>
         </record>
         <record model="account.tax.template" id="iva_reagp_105">
             <field name="name">IVA 10.5% Regimen especial ganadería y pesca</field>
@@ -435,6 +444,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_472"/>
             <field name="update_unit_price" eval="True"/>
             <field name="sequence" eval="10"/>
+            <field name="es_vat_list_code">A</field>
         </record>
         <record model="account.tax.template" id="iva_sop_intracomunitario_1">
             <field name="name">IVA Intracomunitario. Bienes (1)</field>
diff --git a/tax_normal.xml b/tax_normal.xml
index fccf2541a5..3fe8d47acb 100644
--- a/tax_normal.xml
+++ b/tax_normal.xml
@@ -67,6 +67,7 @@ this repository contains the full copyright notices and license terms. -->
             <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="es_vat_list_code">B</field>
         </record>
         <record id="iva_rep_ex_servicios_normal" model="account.tax.template">
             <field name="name">IVA Exento (servicios)</field>
@@ -77,6 +78,7 @@ this repository contains the full copyright notices and license terms. -->
             <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="es_vat_list_code">B</field>
         </record>
         <record id="iva_rep_re_52_normal" model="account.tax.template">
             <field name="name">Recargo equivalencia 5.2%</field>
@@ -88,6 +90,7 @@ 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"/>
             <field name="es_reported_with" ref="iva_rep_21_normal"/>
+            <field name="es_vat_list_code">B</field>
         </record>
         <record id="iva_rep_re_14_normal" model="account.tax.template">
             <field name="name">Recargo Equivalencia 1.4%</field>
@@ -99,6 +102,7 @@ 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"/>
             <field name="es_reported_with" ref="iva_rep_10_normal"/>
+            <field name="es_vat_list_code">B</field>
         </record>
         <record id="iva_rep_re_05_normal" model="account.tax.template">
             <field name="name">Recargo Equivalencia 0.5%</field>
@@ -110,6 +114,7 @@ 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"/>
             <field name="es_reported_with" ref="iva_rep_4_normal"/>
+            <field name="es_vat_list_code">B</field>
         </record>
         <record id="iva_rep_exportaciones_normal" model="account.tax.template">
             <field name="name">IVA Exportaciones (bienes)</field>
@@ -221,6 +226,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="rate" eval="Decimal('0.0')"/>
             <field name="invoice_account" ref="pgc_4700_normal"/>
             <field name="credit_note_account" ref="pgc_4700_normal"/>
+            <field name="es_vat_list_code">A</field>
         </record>
         <record id="iva_sop_ex_servicios_normal" model="account.tax.template">
             <field name="name">IVA Exento (servicios)</field>
@@ -231,6 +237,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="rate" eval="Decimal('0.0')"/>
             <field name="invoice_account" ref="pgc_4700_normal"/>
             <field name="credit_note_account" ref="pgc_4700_normal"/>
+            <field name="es_vat_list_code">A</field>
         </record>
         <record id="iva_sop_21_inv_normal" model="account.tax.template">
             <field name="name">IVA 21% (bienes de inversión)</field>
@@ -274,6 +281,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="rate" eval="Decimal('0.0')"/>
             <field name="invoice_account" ref="pgc_4700_normal"/>
             <field name="credit_note_account" ref="pgc_4700_normal"/>
+            <field name="es_vat_list_code">A</field>
         </record>
         <record id="iva_sop_importacion_normal" model="account.tax.template">
             <field name="name">IVA Importaciones (bienes)</field>
@@ -423,6 +431,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_472_normal"/>
             <field name="update_unit_price" eval="True"/>
             <field name="sequence" eval="10"/>
+            <field name="es_vat_list_code">A</field>
         </record>
         <record id="iva_reagp_105_normal" model="account.tax.template">
             <field name="name">IVA 10.5% Regimen especial ganadería y pesca</field>
@@ -435,6 +444,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_472_normal"/>
             <field name="update_unit_price" eval="True"/>
             <field name="sequence" eval="10"/>
+            <field name="es_vat_list_code">A</field>
         </record>
         <record id="iva_sop_intracomunitario_1_normal" model="account.tax.template">
             <field name="name">IVA Intracomunitario. Bienes (1)</field>
diff --git a/tax_pyme.xml b/tax_pyme.xml
index b0b04c2c0f..4175c27747 100644
--- a/tax_pyme.xml
+++ b/tax_pyme.xml
@@ -67,6 +67,7 @@ this repository contains the full copyright notices and license terms. -->
             <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="es_vat_list_code">B</field>
         </record>
         <record id="iva_rep_ex_servicios_pyme" model="account.tax.template">
             <field name="name">IVA Exento (servicios)</field>
@@ -77,6 +78,7 @@ this repository contains the full copyright notices and license terms. -->
             <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="es_vat_list_code">B</field>
         </record>
         <record id="iva_rep_re_52_pyme" model="account.tax.template">
             <field name="name">Recargo equivalencia 5.2%</field>
@@ -88,6 +90,7 @@ 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"/>
             <field name="es_reported_with" ref="iva_rep_21_pyme"/>
+            <field name="es_vat_list_code">B</field>
         </record>
         <record id="iva_rep_re_14_pyme" model="account.tax.template">
             <field name="name">Recargo Equivalencia 1.4%</field>
@@ -99,6 +102,7 @@ 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"/>
             <field name="es_reported_with" ref="iva_rep_10_pyme"/>
+            <field name="es_vat_list_code">B</field>
         </record>
         <record id="iva_rep_re_05_pyme" model="account.tax.template">
             <field name="name">Recargo Equivalencia 0.5%</field>
@@ -110,6 +114,7 @@ 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"/>
             <field name="es_reported_with" ref="iva_rep_4_pyme"/>
+            <field name="es_vat_list_code">B</field>
         </record>
         <record id="iva_rep_exportaciones_pyme" model="account.tax.template">
             <field name="name">IVA Exportaciones (bienes)</field>
@@ -221,6 +226,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="rate" eval="Decimal('0.0')"/>
             <field name="invoice_account" ref="pgc_4700_pyme"/>
             <field name="credit_note_account" ref="pgc_4700_pyme"/>
+            <field name="es_vat_list_code">A</field>
         </record>
         <record id="iva_sop_ex_servicios_pyme" model="account.tax.template">
             <field name="name">IVA Exento (servicios)</field>
@@ -231,6 +237,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="rate" eval="Decimal('0.0')"/>
             <field name="invoice_account" ref="pgc_4700_pyme"/>
             <field name="credit_note_account" ref="pgc_4700_pyme"/>
+            <field name="es_vat_list_code">A</field>
         </record>
         <record id="iva_sop_21_inv_pyme" model="account.tax.template">
             <field name="name">IVA 21% (bienes de inversión)</field>
@@ -274,6 +281,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="rate" eval="Decimal('0.0')"/>
             <field name="invoice_account" ref="pgc_4700_pyme"/>
             <field name="credit_note_account" ref="pgc_4700_pyme"/>
+            <field name="es_vat_list_code">A</field>
         </record>
         <record id="iva_sop_importacion_pyme" model="account.tax.template">
             <field name="name">IVA Importaciones (bienes)</field>
@@ -423,6 +431,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_472_pyme"/>
             <field name="update_unit_price" eval="True"/>
             <field name="sequence" eval="10"/>
+            <field name="es_vat_list_code">A</field>
         </record>
         <record id="iva_reagp_105_pyme" model="account.tax.template">
             <field name="name">IVA 10.5% Regimen especial ganadería y pesca</field>
@@ -435,6 +444,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="credit_note_account" ref="pgc_472_pyme"/>
             <field name="update_unit_price" eval="True"/>
             <field name="sequence" eval="10"/>
+            <field name="es_vat_list_code">A</field>
         </record>
         <record id="iva_sop_intracomunitario_1_pyme" model="account.tax.template">
             <field name="name">IVA Intracomunitario. Bienes (1)</field>