Merge PR #1203 into 11.0

Signed-off-by pedrobaeza

l10n_es_aeat/models/l10n_es_aeat_report.py

@@ -8,7 +8,7 @@
 import re
 from calendar import monthrange
 from odoo import _, api, fields, exceptions, models
-from odoo.tools import config
+from odoo.tools import config, ormcache
 from datetime import datetime
 from .spanish_states_mapping import SPANISH_STATES as ss
 
@@ -202,6 +202,24 @@ def _check_previous_number(self):
                       "a previous declaration number should be provided.")
                 )
 
+    @ormcache('tax_template', 'company_id')
+    def _get_tax_id_from_tax_template(self, tax_template, company_id):
+        xmlids = self.env['ir.model.data'].search_read([
+            ('model', '=', 'account.tax.template'),
+            ('res_id', '=', tax_template.id)
+        ], ['name', 'module'])
+        return xmlids and self.env['ir.model.data'].search([
+            ('model', '=', 'account.tax'),
+            ('module', '=', xmlids[0]['module']),
+            ('name', '=', '{}_{}'.format(company_id, xmlids[0]['name']))
+        ]).res_id or False
+
+    def get_taxes_from_templates(self, tax_templates):
+        company_id = self.company_id.id or self.env.user.company_id.id
+        tax_ids = [self._get_tax_id_from_tax_template(tmpl, company_id)
+                   for tmpl in tax_templates]
+        return self.env['account.tax'].browse(tax_ids)
+
     @api.onchange('company_id')
     def onchange_company_id(self):
         """Load some company data (the VAT number) when company changes.

l10n_es_vat_book/README.rst

@@ -23,7 +23,7 @@ Libro de IVA
     :target: https://runbot.odoo-community.org/runbot/189/11.0
     :alt: Try me on Runbot
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 Módulo que calcula el libro de IVA español.
 

l10n_es_vat_book/__manifest__.py

@@ -20,7 +20,8 @@
     'data': [
         'security/ir_rule.xml',
         'security/ir.model.access.csv',
-        'data/map_taxes_vat_book.xml',
+        'data/aeat_vat_book_map_data.xml',
+        'views/aeat_vat_book_map_view.xml',
         'views/l10n_es_vat_book.xml',
         'views/l10n_es_vat_book_line.xml',
         'views/l10n_es_vat_book_tax_summary.xml',

l10n_es_vat_book/data/aeat_vat_book_map_data.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<odoo noupdate="0">
+    <record id="aeat_vat_book_map_line_s_iva" model="aeat.vat.book.map.line">
+        <field name="name">IVA repercutido</field>
+        <field name="book_type">issued</field>
+        <field name="special_tax_group" eval="False"/>
+        <field name="fee_type_xlsx_column">N</field>
+        <field name="fee_amount_xlsx_column">O</field>
+        <field name="tax_tmpl_ids" eval="[
+            (4, ref('l10n_es.account_tax_template_s_iva4b')),
+            (4, ref('l10n_es.account_tax_template_s_iva4s')),
+            (4, ref('l10n_es.account_tax_template_s_iva10b')),
+            (4, ref('l10n_es.account_tax_template_s_iva10s')),
+            (4, ref('l10n_es.account_tax_template_s_iva21b')),
+            (4, ref('l10n_es.account_tax_template_s_iva21s')),
+            (4, ref('l10n_es.account_tax_template_s_iva0_isp')),
+            (4, ref('l10n_es.account_tax_template_s_iva0_sp_i')),
+            (4, ref('l10n_es.account_tax_template_s_iva0_ic')),
+            (4, ref('l10n_es.account_tax_template_s_iva0_e')),
+            (4, ref('l10n_es.account_tax_template_s_iva0')),
+            (4, ref('l10n_es.account_tax_template_s_iva_ns')),
+            (4, ref('l10n_es.account_tax_template_s_iva_e')),
+        ]"/>
+    </record>
+
+    <record id="aeat_vat_book_map_line_p_iva" model="aeat.vat.book.map.line">
+        <field name="name">IVA soportado</field>
+        <field name="book_type">received</field>
+        <field name="special_tax_group" eval="False"/>
+        <field name="fee_type_xlsx_column">O</field>
+        <field name="fee_amount_xlsx_column">P</field>
+        <field name="tax_tmpl_ids" eval="[
+            (4, ref('l10n_es.account_tax_template_p_iva4_bc')),
+            (4, ref('l10n_es.account_tax_template_p_iva4_sc')),
+            (4, ref('l10n_es.account_tax_template_p_iva4_bi')),
+            (4, ref('l10n_es.account_tax_template_p_iva10_bc')),
+            (4, ref('l10n_es.account_tax_template_p_iva10_sc')),
+            (4, ref('l10n_es.account_tax_template_p_iva10_bi')),
+            (4, ref('l10n_es.account_tax_template_p_iva21_bc')),
+            (4, ref('l10n_es.account_tax_template_p_iva21_sc')),
+            (4, ref('l10n_es.account_tax_template_p_iva21_bi')),
+            (4, ref('l10n_es.account_tax_template_p_iva0_bc')),
+            (4, ref('l10n_es.account_tax_template_p_iva4_sp_in_2')),
+            (4, ref('l10n_es.account_tax_template_p_iva10_sp_in_2')),
+            (4, ref('l10n_es.account_tax_template_p_iva21_sp_in_2')),
+            (4, ref('l10n_es.account_tax_template_p_iva4_ic_bc_1')),
+            (4, ref('l10n_es.account_tax_template_p_iva10_ic_bc_1')),
+            (4, ref('l10n_es.account_tax_template_p_iva21_ic_bc_1')),
+            (4, ref('l10n_es.account_tax_template_p_iva4_ic_bi_1')),
+            (4, ref('l10n_es.account_tax_template_p_iva10_ic_bi_1')),
+            (4, ref('l10n_es.account_tax_template_p_iva21_ic_bi_1')),
+            (4, ref('l10n_es.account_tax_template_p_iva4_ibc')),
+            (4, ref('l10n_es.account_tax_template_p_iva10_ibc')),
+            (4, ref('l10n_es.account_tax_template_p_iva21_ibc')),
+            (4, ref('l10n_es.account_tax_template_p_iva12_agr')),
+            (4, ref('l10n_es.account_tax_template_p_iva21_isp_1')),
+            (4, ref('l10n_es.account_tax_template_p_iva10_isp_1')),
+            (4, ref('l10n_es.account_tax_template_p_iva4_isp_1')),
+            (4, ref('l10n_es.account_tax_template_p_iva21_sp_ex_2')),
+            (4, ref('l10n_es.account_tax_template_p_iva10_sp_ex_2')),
+            (4, ref('l10n_es.account_tax_template_p_iva4_sp_ex_2')),
+            (4, ref('l10n_es.account_tax_template_p_iva4_bi')),
+            (4, ref('l10n_es.account_tax_template_p_iva10_bi')),
+            (4, ref('l10n_es.account_tax_template_p_iva21_bi')),
+            (4, ref('l10n_es.account_tax_template_p_iva0_ns')),
+        ]"/>
+    </record>
+
+    <record id="aeat_vat_book_map_line_p_iva_nd" model="aeat.vat.book.map.line">
+        <field name="name">IVA soportado no deducible</field>
+        <field name="book_type">received</field>
+        <field name="special_tax_group" eval="False"/>
+        <field name="tax_tmpl_ids" eval="[
+            (4, ref('l10n_es.account_tax_template_p_iva0_nd')),
+        ]"/>
+    </record>
+
+    <record id="aeat_vat_book_map_line_s_req" model="aeat.vat.book.map.line">
+        <field name="name">Recargo Eq.</field>
+        <field name="book_type">issued</field>
+        <field name="special_tax_group">req</field>
+        <field name="fee_type_xlsx_column">P</field>
+        <field name="fee_amount_xlsx_column">Q</field>
+        <field name="tax_tmpl_ids" eval="[
+            (4, ref('l10n_es.account_tax_template_s_req05')),
+            (4, ref('l10n_es.account_tax_template_s_req014')),
+            (4, ref('l10n_es.account_tax_template_s_req52')),
+        ]"/>
+    </record>
+
+    <record id="aeat_vat_book_map_line_p_req" model="aeat.vat.book.map.line">
+        <field name="name">Recargo Eq.</field>
+        <field name="book_type">received</field>
+        <field name="special_tax_group">req</field>
+        <field name="fee_type_xlsx_column">R</field>
+        <field name="fee_amount_xlsx_column">S</field>
+        <field name="tax_tmpl_ids" eval="[
+            (4, ref('l10n_es.account_tax_template_p_req05')),
+            (4, ref('l10n_es.account_tax_template_p_req014')),
+            (4, ref('l10n_es.account_tax_template_p_req52')),
+        ]"/>
+    </record>
+
+</odoo>