From 6118cac7eafb608dd53ee87ca3a7a902baaeb5a7 Mon Sep 17 00:00:00 2001
From: Sergio Morillo <sergio.morillo@datalife.com.es>
Date: Mon, 25 Feb 2019 09:31:06 +0100
Subject: [PATCH] Activate used_tax flag in sales intracommunitary taxes. Fix
 query methods. Add missing fields to tax and tax template form views.

---
 aeat.py                    | 12 ++++--------
 locale/es.po               | 16 ++++++++++++++++
 sii.xml                    |  4 ++--
 view/template_tax_form.xml |  4 ++++
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/aeat.py b/aeat.py
index c1e69ec..667cd77 100644
--- a/aeat.py
+++ b/aeat.py
@@ -568,10 +568,8 @@ class SIIReport(Workflow, ModelSQL, ModelView):
                 crt, key, test=SII_TEST)
             res = srv.query(
                 headers,
-                year=self.fiscalyear.name,
-                period=self.period.start_date.month,
-                mapper=mapper,
-                last_invoice=last_invoice)
+                year=self.period.start_date.year,
+                period=self.period.start_date.month)
 
         registers = \
             res.RegistroRespuestaConsultaLRFacturasEmitidas
@@ -741,10 +739,8 @@ class SIIReport(Workflow, ModelSQL, ModelView):
                 crt, key, test=SII_TEST)
             res = srv.query(
                 headers,
-                year=self.fiscalyear.name,
-                period=self.period.start_date.month,
-                mapper=mapper,
-                last_invoice=last_invoice)
+                year=self.period.start_date.year,
+                period=self.period.start_date.month)
 
         _logger.debug(res)
         registers = res.RegistroRespuestaConsultaLRFacturasRecibidas
diff --git a/locale/es.po b/locale/es.po
index fb87336..7c3efa4 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -82,6 +82,14 @@ msgctxt "field:account.tax,sii_subjected_key:"
 msgid "Subjected Key"
 msgstr "Clave sujeto"
 
+msgctxt "field:account.tax,tax_used:"
+msgid "Used in Tax"
+msgstr "Usado en impuestos"
+
+msgctxt "field:account.tax,invoice_used:"
+msgid "Used in invoice Total"
+msgstr "Usado en total de factura"
+
 msgctxt "field:account.tax.template,sii_book_key:"
 msgid "Book Key"
 msgstr "Clave libro"
@@ -106,6 +114,14 @@ msgctxt "field:account.tax.template,sii_subjected_key:"
 msgid "Subjected Key"
 msgstr "Clave sujeto"
 
+msgctxt "field:account.tax.template,tax_used:"
+msgid "Used in Tax"
+msgstr "Usado en impuestos"
+
+msgctxt "field:account.tax.template,invoice_used:"
+msgid "Used in invoice Total"
+msgstr "Usado en total de factura"
+
 msgctxt "field:aeat.sii.issued.invoice.mapper,id:"
 msgid "ID"
 msgstr "ID"
diff --git a/sii.xml b/sii.xml
index 53c54e3..0ea6e77 100644
--- a/sii.xml
+++ b/sii.xml
@@ -91,14 +91,14 @@ this repository contains the full copyright notices and license terms. -->
             <field name="sii_book_key">E</field>
             <field name="sii_issued_key">01</field>
             <field name="sii_excemption_key">E5</field>
-            <field name="tax_used" eval="False"/>
+            <field name="tax_used" eval="True"/>
             <field name="invoice_used" eval="True"/>
         </record>
         <record model="account.tax.template" id="account_es.iva_IO_serv">
             <field name="sii_book_key">E</field>
             <field name="sii_issued_key">01</field>
             <field name="sii_excemption_key">E6</field>
-            <field name="tax_used" eval="False"/>
+            <field name="tax_used" eval="True"/>
             <field name="invoice_used" eval="True"/>
         </record>
         <record model="account.tax.template" id="account_es.iva_dev_AI">
diff --git a/view/template_tax_form.xml b/view/template_tax_form.xml
index 6e43be1..c9f18a6 100644
--- a/view/template_tax_form.xml
+++ b/view/template_tax_form.xml
@@ -4,6 +4,10 @@ contains the full copyright notices and license terms. -->
 <data>
     <xpath expr="/form/notebook/page[@name='legal_notice']" position="after">
         <page string="AEAT SII" id="aeatsii">
+          <label name="tax_used"/>
+          <field name="tax_used"/>
+          <label name="invoice_used"/>
+          <field name="invoice_used"/>
           <label name="sii_book_key"/>
           <field name="sii_book_key"/>
           <label name="sii_issued_key"/>