From 8e6a3d7269f81191ec8180e6d5ee8d403238f9a2 Mon Sep 17 00:00:00 2001 From: william-andre Date: Thu, 2 Mar 2023 12:00:12 +0000 Subject: [PATCH] [REF] l10n_*: clean code A lot of the separate files were kept up to now because it made the process easier while applying the script to rebase. The files can now be merged. Some code is also cleaned by using CSV instead of a python dict. Part-of: odoo/odoo#114164 --- addons/l10n_ae/models/__init__.py | 1 - .../l10n_ae/models/account_chart_template.py | 42 -- addons/l10n_ae/models/template_ae.py | 36 +- .../l10n_ar/models/account_chart_template.py | 14 - addons/l10n_ar/models/template_ar_base.py | 14 + addons/l10n_at/models/__init__.py | 1 - addons/l10n_at/models/chart_template.py | 16 - addons/l10n_at/models/template_at.py | 2 + addons/l10n_be/models/__init__.py | 1 - .../l10n_be/models/account_chart_template.py | 16 - addons/l10n_be/models/template_be.py | 7 + addons/l10n_ch/models/__init__.py | 1 - addons/l10n_ch/models/chart_template.py | 16 - addons/l10n_ch/models/template_ch.py | 2 + addons/l10n_cl/models/__init__.py | 1 - .../l10n_cl/models/account_chart_template.py | 15 - addons/l10n_cl/models/template_cl.py | 1 + addons/l10n_do/models/__init__.py | 1 - addons/l10n_do/models/chart_template.py | 42 -- addons/l10n_do/models/template_do.py | 35 +- addons/l10n_eg/models/__init__.py | 1 - .../l10n_eg/models/account_chart_template.py | 26 -- addons/l10n_eg/models/template_eg.py | 20 + addons/l10n_es_edi_sii/__init__.py | 5 +- .../data/template/account.tax-es_common.csv | 94 ++++ .../models/account_chart_template.py | 419 +----------------- addons/l10n_fr/models/__init__.py | 3 +- .../l10n_fr/models/account_chart_template.py | 16 - .../models/{l10n_fr.py => res_partner.py} | 0 addons/l10n_fr/models/template_fr.py | 7 + addons/l10n_in/models/__init__.py | 1 - addons/l10n_in/models/chart_template.py | 16 - addons/l10n_in/models/template_in.py | 4 +- addons/l10n_it/models/__init__.py | 1 - .../l10n_it/models/account_chart_template.py | 16 - addons/l10n_it/models/template_it.py | 1 + addons/l10n_kz/models/__init__.py | 1 - addons/l10n_kz/models/chart_template.py | 16 - addons/l10n_kz/models/template_kz.py | 7 + addons/l10n_lu/models/__init__.py | 1 - .../l10n_lu/models/account_chart_template.py | 16 - addons/l10n_lu/models/template_lu.py | 7 + addons/l10n_mx/models/__init__.py | 1 - addons/l10n_mx/models/chart_template.py | 35 -- addons/l10n_mx/models/template_mx.py | 19 +- addons/l10n_sa/models/__init__.py | 1 - .../l10n_sa/models/account_chart_template.py | 45 -- addons/l10n_sa/models/template_sa.py | 39 +- 48 files changed, 293 insertions(+), 789 deletions(-) delete mode 100644 addons/l10n_ae/models/account_chart_template.py delete mode 100644 addons/l10n_at/models/chart_template.py delete mode 100644 addons/l10n_be/models/account_chart_template.py delete mode 100644 addons/l10n_ch/models/chart_template.py delete mode 100644 addons/l10n_cl/models/account_chart_template.py delete mode 100644 addons/l10n_do/models/chart_template.py delete mode 100644 addons/l10n_eg/models/account_chart_template.py create mode 100644 addons/l10n_es_edi_sii/data/template/account.tax-es_common.csv delete mode 100644 addons/l10n_fr/models/account_chart_template.py rename addons/l10n_fr/models/{l10n_fr.py => res_partner.py} (100%) delete mode 100644 addons/l10n_in/models/chart_template.py delete mode 100644 addons/l10n_it/models/account_chart_template.py delete mode 100644 addons/l10n_kz/models/chart_template.py delete mode 100644 addons/l10n_lu/models/account_chart_template.py delete mode 100644 addons/l10n_mx/models/chart_template.py delete mode 100644 addons/l10n_sa/models/account_chart_template.py diff --git a/addons/l10n_ae/models/__init__.py b/addons/l10n_ae/models/__init__.py index f32af5217ff..a974d8164cd 100644 --- a/addons/l10n_ae/models/__init__.py +++ b/addons/l10n_ae/models/__init__.py @@ -1,4 +1,3 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import template_ae from . import account_move_line -from . import account_chart_template diff --git a/addons/l10n_ae/models/account_chart_template.py b/addons/l10n_ae/models/account_chart_template.py deleted file mode 100644 index 2114a42de06..00000000000 --- a/addons/l10n_ae/models/account_chart_template.py +++ /dev/null @@ -1,42 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import models, Command -from odoo.addons.account.models.chart_template import template - - -class AccountChartTemplate(models.AbstractModel): - _inherit = 'account.chart.template' - - @template('ae', 'account.journal') - def _get_ae_account_journal(self): - """ If UAE chart, we add 2 new journals TA and IFRS""" - return { - "tax_adjustment":{ - "name": "Tax Adjustments", - "code": "TA", - "type": "general", - "show_on_dashboard": True, - "sequence": 1, - }, - "ifrs16": { - "name": "IFRS 16", - "code": "IFRS", - "type": "general", - "show_on_dashboard": True, - "sequence": 10, - } - } - - @template('ae', 'account.account') - def _get_ae_account_account(self): - return { - "uae_account_100101": { - 'allowed_journal_ids': [Command.link('ifrs16')], - }, - "uae_account_100102": { - 'allowed_journal_ids': [Command.link('ifrs16')], - }, - "uae_account_400070": { - 'allowed_journal_ids': [Command.link('ifrs16')], - }, - } diff --git a/addons/l10n_ae/models/template_ae.py b/addons/l10n_ae/models/template_ae.py index bcb44bd4b1e..7504b5616eb 100644 --- a/addons/l10n_ae/models/template_ae.py +++ b/addons/l10n_ae/models/template_ae.py @@ -1,5 +1,5 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import models +from odoo import models, Command from odoo.addons.account.models.chart_template import template @@ -31,3 +31,37 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'uae_account_500014', }, } + + @template('ae', 'account.journal') + def _get_ae_account_journal(self): + """ If UAE chart, we add 2 new journals TA and IFRS""" + return { + "tax_adjustment":{ + "name": "Tax Adjustments", + "code": "TA", + "type": "general", + "show_on_dashboard": True, + "sequence": 1, + }, + "ifrs16": { + "name": "IFRS 16", + "code": "IFRS", + "type": "general", + "show_on_dashboard": True, + "sequence": 10, + } + } + + @template('ae', 'account.account') + def _get_ae_account_account(self): + return { + "uae_account_100101": { + 'allowed_journal_ids': [Command.link('ifrs16')], + }, + "uae_account_100102": { + 'allowed_journal_ids': [Command.link('ifrs16')], + }, + "uae_account_400070": { + 'allowed_journal_ids': [Command.link('ifrs16')], + }, + } diff --git a/addons/l10n_ar/models/account_chart_template.py b/addons/l10n_ar/models/account_chart_template.py index 78739dc765d..f2d263fab26 100644 --- a/addons/l10n_ar/models/account_chart_template.py +++ b/addons/l10n_ar/models/account_chart_template.py @@ -7,20 +7,6 @@ from odoo.addons.account.models.chart_template import template class AccountChartTemplate(models.AbstractModel): _inherit = 'account.chart.template' - @template('ar_base', 'account.journal') - def _get_ar_account_journal(self): - """ In case of an Argentinean CoA, we modify the default values of the sales journal to be a preprinted journal""" - return { - 'sale': { - "name": "Ventas Preimpreso", - "code": "0001", - "l10n_ar_afip_pos_number": 1, - "l10n_ar_afip_pos_partner_id": self.env.company.partner_id.id, - "l10n_ar_afip_pos_system": 'II_IM', - "refund_sequence": False, - }, - } - @api.model def _get_ar_responsibility_match(self, chart_template): """ return responsibility type that match with the given chart_template code diff --git a/addons/l10n_ar/models/template_ar_base.py b/addons/l10n_ar/models/template_ar_base.py index 11169e494b0..40d888d5e7a 100644 --- a/addons/l10n_ar/models/template_ar_base.py +++ b/addons/l10n_ar/models/template_ar_base.py @@ -30,3 +30,17 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'base_diferencias_de_cambio', }, } + + @template('ar_base', 'account.journal') + def _get_ar_account_journal(self): + """ In case of an Argentinean CoA, we modify the default values of the sales journal to be a preprinted journal""" + return { + 'sale': { + "name": "Ventas Preimpreso", + "code": "0001", + "l10n_ar_afip_pos_number": 1, + "l10n_ar_afip_pos_partner_id": self.env.company.partner_id.id, + "l10n_ar_afip_pos_system": 'II_IM', + "refund_sequence": False, + }, + } diff --git a/addons/l10n_at/models/__init__.py b/addons/l10n_at/models/__init__.py index b302863d6fd..998be291cbe 100644 --- a/addons/l10n_at/models/__init__.py +++ b/addons/l10n_at/models/__init__.py @@ -1,3 +1,2 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import template_at -from . import chart_template diff --git a/addons/l10n_at/models/chart_template.py b/addons/l10n_at/models/chart_template.py deleted file mode 100644 index d720b0ca05f..00000000000 --- a/addons/l10n_at/models/chart_template.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import models -from odoo.addons.account.models.chart_template import template - - -class AccountChartTemplate(models.AbstractModel): - _inherit = 'account.chart.template' - - @template('at', 'res.company') - def _get_at_res_company(self): - company_data = super()._get_at_res_company() - company_data[self.env.company.id].update({ - 'external_report_layout_id': 'l10n_din5008.external_layout_din5008', - 'paperformat_id': 'l10n_din5008.paperformat_euro_din', - }) - return company_data diff --git a/addons/l10n_at/models/template_at.py b/addons/l10n_at/models/template_at.py index 8287044d1d5..44c8912f60f 100644 --- a/addons/l10n_at/models/template_at.py +++ b/addons/l10n_at/models/template_at.py @@ -33,5 +33,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'chart_at_template_7860', 'account_journal_early_pay_discount_loss_account_id': 'chart_at_template_5800', 'account_journal_early_pay_discount_gain_account_id': 'chart_at_template_8350', + 'external_report_layout_id': 'l10n_din5008.external_layout_din5008', + 'paperformat_id': 'l10n_din5008.paperformat_euro_din', }, } diff --git a/addons/l10n_be/models/__init__.py b/addons/l10n_be/models/__init__.py index 20cbb03aecb..adef1cd290d 100644 --- a/addons/l10n_be/models/__init__.py +++ b/addons/l10n_be/models/__init__.py @@ -1,6 +1,5 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import template_be -from . import account_chart_template from . import account_journal from . import account_move from . import res_partner diff --git a/addons/l10n_be/models/account_chart_template.py b/addons/l10n_be/models/account_chart_template.py deleted file mode 100644 index 3fcbc2cc879..00000000000 --- a/addons/l10n_be/models/account_chart_template.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from odoo import api, models -from odoo.addons.account.models.chart_template import template - - -class AccountChartTemplate(models.AbstractModel): - _inherit = 'account.chart.template' - - @template('be', 'account.journal') - def _get_be_account_journal(self): - return { - 'sale': {'refund_sequence': True}, - 'purchase': {'refund_sequence': True}, - } diff --git a/addons/l10n_be/models/template_be.py b/addons/l10n_be/models/template_be.py index 717c5234815..7bec5517568 100644 --- a/addons/l10n_be/models/template_be.py +++ b/addons/l10n_be/models/template_be.py @@ -33,6 +33,13 @@ class AccountChartTemplate(models.AbstractModel): }, } + @template('be', 'account.journal') + def _get_be_account_journal(self): + return { + 'sale': {'refund_sequence': True}, + 'purchase': {'refund_sequence': True}, + } + @template('be', 'account.reconcile.model') def _get_be_reconcile_model(self): return { diff --git a/addons/l10n_ch/models/__init__.py b/addons/l10n_ch/models/__init__.py index aeca76ac2b9..35d4b3e7b2d 100644 --- a/addons/l10n_ch/models/__init__.py +++ b/addons/l10n_ch/models/__init__.py @@ -7,4 +7,3 @@ from . import res_bank from . import res_company from . import account_bank_statement from . import ir_actions_report -from . import chart_template diff --git a/addons/l10n_ch/models/chart_template.py b/addons/l10n_ch/models/chart_template.py deleted file mode 100644 index a431226b6c0..00000000000 --- a/addons/l10n_ch/models/chart_template.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import models -from odoo.addons.account.models.chart_template import template - - -class AccountChartTemplate(models.AbstractModel): - _inherit = 'account.chart.template' - - @template('ch', 'res.company') - def _get_ch_res_company(self): - company_data = super()._get_ch_res_company() - company_data[self.env.company.id].update({ - 'external_report_layout_id': 'l10n_din5008.external_layout_din5008', - 'paperformat_id': 'l10n_din5008.paperformat_euro_din', - }) - return company_data diff --git a/addons/l10n_ch/models/template_ch.py b/addons/l10n_ch/models/template_ch.py index 56aaac44d9d..cecfcd6732e 100644 --- a/addons/l10n_ch/models/template_ch.py +++ b/addons/l10n_ch/models/template_ch.py @@ -29,5 +29,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'ch_coa_4906', 'account_journal_early_pay_discount_loss_account_id': 'ch_coa_4901', 'account_journal_early_pay_discount_gain_account_id': 'ch_coa_3801', + 'external_report_layout_id': 'l10n_din5008.external_layout_din5008', + 'paperformat_id': 'l10n_din5008.paperformat_euro_din', }, } diff --git a/addons/l10n_cl/models/__init__.py b/addons/l10n_cl/models/__init__.py index ac1fefdbde1..708f73775b6 100644 --- a/addons/l10n_cl/models/__init__.py +++ b/addons/l10n_cl/models/__init__.py @@ -1,6 +1,5 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import template_cl -from . import account_chart_template from . import account_move from . import account_move_line from . import account_tax diff --git a/addons/l10n_cl/models/account_chart_template.py b/addons/l10n_cl/models/account_chart_template.py deleted file mode 100644 index 86289e3ee4f..00000000000 --- a/addons/l10n_cl/models/account_chart_template.py +++ /dev/null @@ -1,15 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import models -from odoo.addons.account.models.chart_template import template - - -class AccountChartTemplate(models.AbstractModel): - _inherit = 'account.chart.template' - - @template('cl', 'res.company') - def _get_cl_res_company(self): - company_data = super()._get_cl_res_company() - company_data[self.env.company.id].update({ - 'tax_calculation_rounding_method': 'round_globally', - }) - return company_data diff --git a/addons/l10n_cl/models/template_cl.py b/addons/l10n_cl/models/template_cl.py index 054fc5fb9d7..a2959fcbc1b 100644 --- a/addons/l10n_cl/models/template_cl.py +++ b/addons/l10n_cl/models/template_cl.py @@ -31,5 +31,6 @@ class AccountChartTemplate(models.AbstractModel): 'account_default_pos_receivable_account_id': 'account_110421', 'income_currency_exchange_account_id': 'account_410195', 'expense_currency_exchange_account_id': 'account_410195', + 'tax_calculation_rounding_method': 'round_globally', }, } diff --git a/addons/l10n_do/models/__init__.py b/addons/l10n_do/models/__init__.py index 8f12b2b262f..f801afff26e 100644 --- a/addons/l10n_do/models/__init__.py +++ b/addons/l10n_do/models/__init__.py @@ -1,3 +1,2 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import template_do -from . import chart_template diff --git a/addons/l10n_do/models/chart_template.py b/addons/l10n_do/models/chart_template.py deleted file mode 100644 index 0f92651c068..00000000000 --- a/addons/l10n_do/models/chart_template.py +++ /dev/null @@ -1,42 +0,0 @@ -# coding: utf-8 -# Copyright 2016 iterativo (https://www.iterativo.do) - -from odoo import models, _ -from odoo.addons.account.models.chart_template import template - - -class AccountChartTemplate(models.AbstractModel): - _inherit = "account.chart.template" - - @template('do', 'account.journal') - def _get_do_account_journal(self): - return { - "caja_chica": { - 'name': _('Caja Chica'), - 'type': 'cash', - 'sequence': 10, - }, - "cheques_clientes": { - 'name': _('Cheques Clientes'), - 'type': 'cash', - 'sequence': 10, - }, - "gasto": { - 'type': 'purchase', - 'name': _('Gastos No Deducibles'), - 'code': 'GASTO', - 'show_on_dashboard': True, - }, - "cxp": { - 'type': 'purchase', - 'name': _('Migración CxP'), - 'code': 'CXP', - 'show_on_dashboard': True, - }, - "cxc": { - 'type': 'sale', - 'name': _('Migración CxC'), - 'code': 'CXC', - 'show_on_dashboard': True, - }, - } diff --git a/addons/l10n_do/models/template_do.py b/addons/l10n_do/models/template_do.py index cbe52f58dd9..f3ff71a7310 100644 --- a/addons/l10n_do/models/template_do.py +++ b/addons/l10n_do/models/template_do.py @@ -1,5 +1,5 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import models +from odoo import models, _ from odoo.addons.account.models.chart_template import template @@ -35,3 +35,36 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'do_niif_99900004', }, } + + @template('do', 'account.journal') + def _get_do_account_journal(self): + return { + "caja_chica": { + 'name': _('Caja Chica'), + 'type': 'cash', + 'sequence': 10, + }, + "cheques_clientes": { + 'name': _('Cheques Clientes'), + 'type': 'cash', + 'sequence': 10, + }, + "gasto": { + 'type': 'purchase', + 'name': _('Gastos No Deducibles'), + 'code': 'GASTO', + 'show_on_dashboard': True, + }, + "cxp": { + 'type': 'purchase', + 'name': _('Migración CxP'), + 'code': 'CXP', + 'show_on_dashboard': True, + }, + "cxc": { + 'type': 'sale', + 'name': _('Migración CxC'), + 'code': 'CXC', + 'show_on_dashboard': True, + }, + } diff --git a/addons/l10n_eg/models/__init__.py b/addons/l10n_eg/models/__init__.py index 30e6f309f85..42aff76a480 100644 --- a/addons/l10n_eg/models/__init__.py +++ b/addons/l10n_eg/models/__init__.py @@ -1,4 +1,3 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import template_eg -from . import account_chart_template from . import account_tax diff --git a/addons/l10n_eg/models/account_chart_template.py b/addons/l10n_eg/models/account_chart_template.py deleted file mode 100644 index 00a2314b0b2..00000000000 --- a/addons/l10n_eg/models/account_chart_template.py +++ /dev/null @@ -1,26 +0,0 @@ -from odoo import models -from odoo.addons.account.models.chart_template import template - - -class AccountChartTemplate(models.AbstractModel): - _inherit = 'account.chart.template' - - @template('eg', 'account.journal') - def _get_eg_account_journal(self): - """ If EGYPT chart, we add 2 new journals TA and IFRS""" - return { - "tax_adjustment": { - "name": "Tax Adjustments", - "code": "TA", - "type": "general", - "sequence": 1, - "show_on_dashboard": True, - }, - "ifrs": { - "name": "IFRS 16", - "code": "IFRS", - "type": "general", - "show_on_dashboard": True, - "sequence": 10, - }, - } diff --git a/addons/l10n_eg/models/template_eg.py b/addons/l10n_eg/models/template_eg.py index f2cf519356e..910d500b1c8 100644 --- a/addons/l10n_eg/models/template_eg.py +++ b/addons/l10n_eg/models/template_eg.py @@ -38,3 +38,23 @@ class AccountChartTemplate(models.AbstractModel): 'default_cash_difference_expense_account_id': 'egy_account_999001', }, } + + @template('eg', 'account.journal') + def _get_eg_account_journal(self): + """ If EGYPT chart, we add 2 new journals TA and IFRS""" + return { + "tax_adjustment": { + "name": "Tax Adjustments", + "code": "TA", + "type": "general", + "sequence": 1, + "show_on_dashboard": True, + }, + "ifrs": { + "name": "IFRS 16", + "code": "IFRS", + "type": "general", + "show_on_dashboard": True, + "sequence": 10, + }, + } diff --git a/addons/l10n_es_edi_sii/__init__.py b/addons/l10n_es_edi_sii/__init__.py index 498f682dc1b..557fa3d44c6 100644 --- a/addons/l10n_es_edi_sii/__init__.py +++ b/addons/l10n_es_edi_sii/__init__.py @@ -7,7 +7,4 @@ def _l10n_es_edi_post_init(env): for company in env['res.company'].search([('partner_id.country_id.code', '=', 'ES')]): ChartTemplate = env['account.chart.template'].with_company(company) taxes_data = ChartTemplate._get_es_edi_sii_account_tax() - for xml_id, tax_data in taxes_data.items(): - tax = ChartTemplate.ref(xml_id, raise_if_not_found=False) - if tax: - tax.write(tax_data) + ChartTemplate._load_data({'account.tax': taxes_data}) diff --git a/addons/l10n_es_edi_sii/data/template/account.tax-es_common.csv b/addons/l10n_es_edi_sii/data/template/account.tax-es_common.csv new file mode 100644 index 00000000000..4eed8c4224c --- /dev/null +++ b/addons/l10n_es_edi_sii/data/template/account.tax-es_common.csv @@ -0,0 +1,94 @@ +"id","name","l10n_es_type","l10n_es_bien_inversion","l10n_es_exempt_reason","tax_scope" +"account_tax_template_s_iva21b","","sujeto","","","consu" +"account_tax_template_s_iva21s","","sujeto","","","service" +"account_tax_template_s_iva21isp","","sujeto_isp","","","" +"account_tax_template_p_iva21_bc","21% IVA soportado (bienes corrientes)","sujeto","","","consu" +"account_tax_template_p_iva21_sc","21% IVA soportado (servicios corrientes)","sujeto","","","service" +"account_tax_template_p_iva21_sp_in","IVA 21% Adquisición de servicios intracomunitarios","sujeto","","","service" +"account_tax_template_p_iva21_ic_bc","IVA 21% Adquisición Intracomunitaria. Bienes corrientes","sujeto","","","consu" +"account_tax_template_p_iva21_ic_bi","IVA 21% Adquisición Intracomunitaria. Bienes de inversión","sujeto","","","consu" +"account_tax_template_p_iva21_ibc","IVA 21% Importaciones bienes corrientes","sujeto","","","consu" +"account_tax_template_p_iva21_ibi","IVA 21% Importaciones bienes de inversión","sujeto","","","consu" +"account_tax_template_p_irpf21td","Retenciones IRPF (Trabajadores) dinerarios","retencion","","","" +"account_tax_template_p_iva4_sp_ex","IVA 4% Adquisición de servicios extracomunitarios","sujeto_isp","","","consu" +"account_tax_template_p_iva10_sp_ex","IVA 10% Adquisición de servicios extracomunitarios","sujeto_isp","","","consu" +"account_tax_template_p_iva21_sp_ex","IVA 21% Adquisición de servicios extracomunitarios","sujeto_isp","","","service" +"account_tax_template_p_iva4_ic_bc","IVA 4% Adquisición Intracomunitario. Bienes corrientes","sujeto","","","consu" +"account_tax_template_p_iva4_ic_bi","IVA 4% Adquisición Intracomunitario. Bienes de inversión","sujeto","","","consu" +"account_tax_template_p_iva10_ic_bc","IVA 10% Adquisición Intracomunitario. Bienes corrientes","sujeto","","","consu" +"account_tax_template_p_iva10_ic_bi","IVA 10% Adquisición Intracomunitario. Bienes de inversión","sujeto","","","consu" +"account_tax_template_s_iva0_sp_i","IVA 0% Prestación de servicios intracomunitario","no_sujeto","","","service" +"account_tax_template_s_iva_ns","No sujeto Repercutido (Servicios)","no_sujeto","","","service" +"account_tax_template_s_iva_ns_b","No sujeto Repercutido (Bienes)","no_sujeto","","","consu" +"account_tax_template_s_iva_e","IVA 0% Prestación de servicios extracomunitaria","no_sujeto","","","service" +"account_tax_template_p_iva4_ibc","IVA 4% Importaciones bienes corrientes","sujeto","","","consu" +"account_tax_template_p_iva4_ibi","IVA 4% Importaciones bienes de inversión","sujeto","","","consu" +"account_tax_template_p_iva10_ibc","IVA 10% Importaciones bienes corrientes","sujeto","","","consu" +"account_tax_template_p_iva10_ibi","IVA 10% Importaciones bienes de inversión","sujeto","","","consu" +"account_tax_template_p_iva4_bi","4% IVA Soportado (bienes de inversión)","sujeto","True","","consu" +"account_tax_template_p_iva4_sc","4% IVA soportado (servicios corrientes)","sujeto","","","consu" +"account_tax_template_p_iva10_bi","10% IVA Soportado (bienes de inversión)","sujeto","True","","consu" +"account_tax_template_p_iva21_bi","21% IVA Soportado (bienes de inversión)","sujeto","True","","consu" +"account_tax_template_p_iva10_bc","10% IVA soportado (bienes corrientes)","sujeto","","","consu" +"account_tax_template_p_iva4_bc","4% IVA soportado (bienes corrientes)","sujeto","","","consu" +"account_tax_template_p_iva10_sc","10% IVA soportado (servicios corrientes)","sujeto","","","consu" +"account_tax_template_s_iva0","IVA Exento Repercutido Sujeto","exento","","E1","" +"account_tax_template_s_iva0_ns","IVA Exento Repercutido No Sujeto","ignore","","","" +"account_tax_template_s_req05","0.50% Recargo Equivalencia Ventas","recargo","","","" +"account_tax_template_s_iva4b","IVA 4% (Bienes)","sujeto","","","consu" +"account_tax_template_s_iva10b","IVA 10% (Bienes)","sujeto","","","consu" +"account_tax_template_p_iva0_nd","21% IVA Soportado no deducible","no_deducible","","","" +"account_tax_template_p_iva10_nd","10% IVA Soportado no deducible","no_deducible","","","" +"account_tax_template_p_iva4_nd","4% IVA Soportado no deducible","no_deducible","","","" +"account_tax_template_s_iva4s","IVA 4% (Servicios)","sujeto","","","service" +"account_tax_template_s_iva10s","IVA 10% (Servicios)","sujeto","","","service" +"account_tax_template_s_req014","1.4% Recargo Equivalencia Ventas","recargo","","","" +"account_tax_template_s_req52","5.2% Recargo Equivalencia Ventas","recargo","","","" +"account_tax_template_p_iva0_bc","IVA Soportado exento (operaciones corrientes)","sujeto","","","consu" +"account_tax_template_p_iva0_ns","IVA Soportado no sujeto (Servicios)","no_sujeto","","","service" +"account_tax_template_p_iva0_ns_b","IVA Soportado no sujeto (Bienes)","no_sujeto","","","consu" +"account_tax_template_s_irpf9","Retenciones a cuenta IRPF 9%","retencion","","","" +"account_tax_template_s_irpf18","Retenciones a cuenta IRPF 18%","retencion","","","" +"account_tax_template_s_irpf19","Retenciones a cuenta IRPF 19%","retencion","","","" +"account_tax_template_s_irpf19a","Retenciones a cuenta 19% (Arrendamientos)","retencion","","","" +"account_tax_template_s_irpf195a","Retenciones a cuenta 19,5% (Arrendamientos)","retencion","","","" +"account_tax_template_p_irpf19","Retenciones IRPF 19%","retencion","","","" +"account_tax_template_p_irpf20a","Retenciones 20% (Arrendamientos)","retencion","","","" +"account_tax_template_p_irpf18","Retenciones IRPF 18%","retencion","","","" +"account_tax_template_p_irpf19a","Retenciones 19% (Arrendamientos)","retencion","","","" +"account_tax_template_p_irpf195a","Retenciones 19,5% (Arrendamientos)","retencion","","","" +"account_tax_template_p_irpf7","Retenciones IRPF 7%","retencion","","","" +"account_tax_template_p_irpf9","Retenciones IRPF 9%","retencion","","","" +"account_tax_template_p_irpf24","Retenciones IRPF 14%","retencion","","","" +"account_tax_template_s_irpf20","Retenciones a cuenta IRPF 20%","retencion","","","" +"account_tax_template_s_irpf20a","Retenciones a cuenta 20% (Arrendamientos)","retencion","","","" +"account_tax_template_s_irpf24","Retenciones a cuenta IRPF 24%","retencion","","","" +"account_tax_template_p_iva12_agr","12% IVA Soportado régimen agricultura","sujeto_agricultura","","","" +"account_tax_template_p_iva105_gan","10,5% IVA Soportado régimen ganadero o pesca","","","","" +"account_tax_template_s_iva0_e","IVA 0% Exportaciones","exento","","E2","consu" +"account_tax_template_s_iva0_ic","IVA 0% Entregas Intracomunitarias exentas","exento","","E5","consu" +"account_tax_template_p_req014","1.4% Recargo Equivalencia Compras","recargo","","","" +"account_tax_template_p_req05","0.50% Recargo Equivalencia Compras","recargo","","","" +"account_tax_template_p_req52","5.2% Recargo Equivalencia Compras","recargo","","","" +"account_tax_template_s_irpf1","Retenciones a cuenta IRPF 1%","retencion","","","" +"account_tax_template_s_irpf2","Retenciones a cuenta IRPF 2%","retencion","","","" +"account_tax_template_s_irpf21","Retenciones a cuenta IRPF 21%","retencion","","","" +"account_tax_template_s_irpf21a","Retenciones a cuenta 21% (Arrendamientos)","retencion","","","" +"account_tax_template_s_irpf7","Retenciones a cuenta IRPF 7%","retencion","","","" +"account_tax_template_s_irpf15","Retenciones a cuenta IRPF 15%","retencion","","","" +"account_tax_template_p_irpf1","Retenciones IRPF 1%","retencion","","","" +"account_tax_template_p_irpf15","Retenciones IRPF 15%","retencion","","","" +"account_tax_template_p_irpf21t","Retenciones IRPF (Trabajadores)","retencion","","","" +"account_tax_template_p_iva10_sp_in","IVA 10% Adquisición de servicios intracomunitarios","retencion","","","" +"account_tax_template_p_iva4_sp_in","IVA 4% Adquisición de servicios intracomunitarios","retencion","","","" +"account_tax_template_p_irpf21te","Retenciones IRPF (Trabajadores) en especie","retencion","","","" +"account_tax_template_p_irpf20","Retenciones IRPF 20%","retencion","","","" +"account_tax_template_p_irpf21a","Retenciones 21% (Arrendamientos)","retencion","","","" +"account_tax_template_p_irpf21p","Retenciones IRPF 21%","retencion","","","" +"account_tax_template_p_irpf2","Retenciones IRPF 2%","retencion","","","" +"account_tax_template_s_iva0_isp","IVA 0% Venta con Inversión del Sujeto Pasivo","sujeto_isp","","","" +"account_tax_template_p_iva4_isp","IVA 4% Compra con Inversión del Sujeto Pasivo Nacional","sujeto_isp","","","" +"account_tax_template_p_iva10_isp","IVA 10% Compra con Inversión del Sujeto Pasivo Nacional","sujeto_isp","","","" +"account_tax_template_p_iva21_isp","IVA 21% Compra con Inversión del Sujeto Pasivo Nacional","sujeto_isp","","","" +"account_tax_template_p_rp19","Retenciones 19% (préstamos)","retencion","","","" +"account_tax_template_p_rrD19","Retenciones 19% (reparto de dividendos)","retencion","","","" diff --git a/addons/l10n_es_edi_sii/models/account_chart_template.py b/addons/l10n_es_edi_sii/models/account_chart_template.py index b895e181727..4765ed4b06b 100644 --- a/addons/l10n_es_edi_sii/models/account_chart_template.py +++ b/addons/l10n_es_edi_sii/models/account_chart_template.py @@ -7,421 +7,4 @@ class AccountChartTemplate(models.AbstractModel): @template('es_common', 'account.tax') def _get_es_edi_sii_account_tax(self): - return { - 'account_tax_template_s_iva21b': { - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_s_iva21s': { - 'l10n_es_type': 'sujeto', - 'tax_scope': 'service', - }, - 'account_tax_template_s_iva21isp': { - 'l10n_es_type': 'sujeto_isp', - }, - 'account_tax_template_p_iva21_bc': { - 'name': "21% IVA soportado (bienes corrientes)", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva21_sc': { - 'name': "21% IVA soportado (servicios corrientes)", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'service', - }, - 'account_tax_template_p_iva21_sp_in': { - 'name': "IVA 21% Adquisición de servicios intracomunitarios", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'service', - }, - 'account_tax_template_p_iva21_ic_bc': { - 'name': "IVA 21% Adquisición Intracomunitaria. Bienes corrientes", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva21_ic_bi': { - 'name': "IVA 21% Adquisición Intracomunitaria. Bienes de inversión", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva21_ibc': { - 'name': "IVA 21% Importaciones bienes corrientes", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva21_ibi': { - 'name': "IVA 21% Importaciones bienes de inversión", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_irpf21td': { - 'name': "Retenciones IRPF (Trabajadores) dinerarios", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_iva4_sp_ex': { - 'name': "IVA 4% Adquisición de servicios extracomunitarios", - 'l10n_es_type': 'sujeto_isp', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva10_sp_ex': { - 'name': "IVA 10% Adquisición de servicios extracomunitarios", - 'l10n_es_type': 'sujeto_isp', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva21_sp_ex': { - 'name': "IVA 21% Adquisición de servicios extracomunitarios", - 'l10n_es_type': 'sujeto_isp', - 'tax_scope': 'service', - }, - 'account_tax_template_p_iva4_ic_bc': { - 'name': "IVA 4% Adquisición Intracomunitario. Bienes corrientes", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva4_ic_bi': { - 'name': "IVA 4% Adquisición Intracomunitario. Bienes de inversión", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva10_ic_bc': { - 'name': "IVA 10% Adquisición Intracomunitario. Bienes corrientes", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva10_ic_bi': { - 'name': "IVA 10% Adquisición Intracomunitario. Bienes de inversión", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_s_iva0_sp_i': { - 'name': "IVA 0% Prestación de servicios intracomunitario", - 'l10n_es_type': 'no_sujeto', - 'tax_scope': 'service', - }, - 'account_tax_template_s_iva_ns': { - 'name': "No sujeto Repercutido (Servicios)", - 'l10n_es_type': 'no_sujeto', - 'tax_scope': 'service', - }, - 'account_tax_template_s_iva_ns_b': { - 'name': "No sujeto Repercutido (Bienes)", - 'l10n_es_type': 'no_sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_s_iva_e': { - 'name': "IVA 0% Prestación de servicios extracomunitaria", - 'l10n_es_type': 'no_sujeto', - 'tax_scope': 'service', - }, - 'account_tax_template_p_iva4_ibc': { - 'name': "IVA 4% Importaciones bienes corrientes", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva4_ibi': { - 'name': "IVA 4% Importaciones bienes de inversión", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva10_ibc': { - 'name': "IVA 10% Importaciones bienes corrientes", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva10_ibi': { - 'name': "IVA 10% Importaciones bienes de inversión", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva4_bi': { - 'name': "4% IVA Soportado (bienes de inversión)", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - 'l10n_es_bien_inversion': True, - }, - 'account_tax_template_p_iva4_sc': { - 'name': "4% IVA soportado (servicios corrientes)", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva10_bi': { - 'name': "10% IVA Soportado (bienes de inversión)", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - 'l10n_es_bien_inversion': True, - }, - 'account_tax_template_p_iva21_bi': { - 'name': "21% IVA Soportado (bienes de inversión)", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - 'l10n_es_bien_inversion': True, - }, - 'account_tax_template_p_iva10_bc': { - 'name': "10% IVA soportado (bienes corrientes)", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva4_bc': { - 'name': "4% IVA soportado (bienes corrientes)", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva10_sc': { - 'name': "10% IVA soportado (servicios corrientes)", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_s_iva0': { - 'name': "IVA Exento Repercutido Sujeto", - 'l10n_es_type': 'exento', - 'l10n_es_exempt_reason': 'E1', - }, - 'account_tax_template_s_iva0_ns': { - 'name': "IVA Exento Repercutido No Sujeto", - 'l10n_es_type': 'ignore', - }, - 'account_tax_template_s_req05': { - 'name': "0.50% Recargo Equivalencia Ventas", - 'l10n_es_type': 'recargo', - }, - 'account_tax_template_s_iva4b': { - 'name': "IVA 4% (Bienes)", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_s_iva10b': { - 'name': "IVA 10% (Bienes)", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva0_nd': { - 'name': "21% IVA Soportado no deducible", - 'l10n_es_type': 'no_deducible', - }, - 'account_tax_template_p_iva10_nd': { - 'name': "10% IVA Soportado no deducible", - 'l10n_es_type': 'no_deducible', - }, - 'account_tax_template_p_iva4_nd': { - 'name': "4% IVA Soportado no deducible", - 'l10n_es_type': 'no_deducible', - }, - 'account_tax_template_s_iva4s': { - 'name': "IVA 4% (Servicios)", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'service', - }, - 'account_tax_template_s_iva10s': { - 'name': "IVA 10% (Servicios)", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'service', - }, - 'account_tax_template_s_req014': { - 'name': "1.4% Recargo Equivalencia Ventas", - 'l10n_es_type': 'recargo', - }, - 'account_tax_template_s_req52': { - 'name': "5.2% Recargo Equivalencia Ventas", - 'l10n_es_type': 'recargo', - }, - 'account_tax_template_p_iva0_bc': { - 'name': "IVA Soportado exento (operaciones corrientes)", - 'l10n_es_type': 'sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_iva0_ns': { - 'name': "IVA Soportado no sujeto (Servicios)", - 'l10n_es_type': 'no_sujeto', - 'tax_scope': 'service', - }, - 'account_tax_template_p_iva0_ns_b': { - 'name': "IVA Soportado no sujeto (Bienes)", - 'l10n_es_type': 'no_sujeto', - 'tax_scope': 'consu', - }, - 'account_tax_template_s_irpf9': { - 'name': "Retenciones a cuenta IRPF 9%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_s_irpf18': { - 'name': "Retenciones a cuenta IRPF 18%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_s_irpf19': { - 'name': "Retenciones a cuenta IRPF 19%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_s_irpf19a': { - 'name': "Retenciones a cuenta 19% (Arrendamientos)", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_s_irpf195a': { - 'name': "Retenciones a cuenta 19,5% (Arrendamientos)", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_irpf19': { - 'name': "Retenciones IRPF 19%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_irpf20a': { - 'name': "Retenciones 20% (Arrendamientos)", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_irpf18': { - 'name': "Retenciones IRPF 18%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_irpf19a': { - 'name': "Retenciones 19% (Arrendamientos)", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_irpf195a': { - 'name': "Retenciones 19,5% (Arrendamientos)", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_irpf7': { - 'name': "Retenciones IRPF 7%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_irpf9': { - 'name': "Retenciones IRPF 9%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_irpf24': { - 'name': "Retenciones IRPF 14%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_s_irpf20': { - 'name': "Retenciones a cuenta IRPF 20%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_s_irpf20a': { - 'name': "Retenciones a cuenta 20% (Arrendamientos)", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_s_irpf24': { - 'name': "Retenciones a cuenta IRPF 24%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_iva12_agr': { - 'name': "12% IVA Soportado régimen agricultura", - 'l10n_es_type': 'sujeto_agricultura', - }, - 'account_tax_template_p_iva105_gan': { - 'name': "10,5% IVA Soportado régimen ganadero o pesca", - }, - 'account_tax_template_s_iva0_e': { - 'name': "IVA 0% Exportaciones", - 'l10n_es_type': 'exento', - # E2 for exportation - 'l10n_es_exempt_reason': 'E2', - 'tax_scope': 'consu', - }, - 'account_tax_template_s_iva0_ic': { - 'name': "IVA 0% Entregas Intracomunitarias exentas", - 'l10n_es_type': 'exento', - # E5 for intra-community - 'l10n_es_exempt_reason': 'E5', - 'tax_scope': 'consu', - }, - 'account_tax_template_p_req014': { - 'name': "1.4% Recargo Equivalencia Compras", - 'l10n_es_type': 'recargo', - }, - 'account_tax_template_p_req05': { - 'name': "0.50% Recargo Equivalencia Compras", - 'l10n_es_type': 'recargo', - }, - 'account_tax_template_p_req52': { - 'name': "5.2% Recargo Equivalencia Compras", - 'l10n_es_type': 'recargo', - }, - 'account_tax_template_s_irpf1': { - 'name': "Retenciones a cuenta IRPF 1%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_s_irpf2': { - 'name': "Retenciones a cuenta IRPF 2%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_s_irpf21': { - 'name': "Retenciones a cuenta IRPF 21%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_s_irpf21a': { - 'name': "Retenciones a cuenta 21% (Arrendamientos)", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_s_irpf7': { - 'name': "Retenciones a cuenta IRPF 7%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_s_irpf15': { - 'name': "Retenciones a cuenta IRPF 15%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_irpf1': { - 'name': "Retenciones IRPF 1%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_irpf15': { - 'name': "Retenciones IRPF 15%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_irpf21t': { - 'name': "Retenciones IRPF (Trabajadores)", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_iva10_sp_in': { - 'name': "IVA 10% Adquisición de servicios intracomunitarios", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_iva4_sp_in': { - 'name': "IVA 4% Adquisición de servicios intracomunitarios", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_irpf21te': { - 'name': "Retenciones IRPF (Trabajadores) en especie", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_irpf20': { - 'name': "Retenciones IRPF 20%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_irpf21a': { - 'name': "Retenciones 21% (Arrendamientos)", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_irpf21p': { - 'name': "Retenciones IRPF 21%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_irpf2': { - 'name': "Retenciones IRPF 2%", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_s_iva0_isp': { - 'name': "IVA 0% Venta con Inversión del Sujeto Pasivo", - 'l10n_es_type': 'sujeto_isp', - }, - 'account_tax_template_p_iva4_isp': { - 'name': "IVA 4% Compra con Inversión del Sujeto Pasivo Nacional", - 'l10n_es_type': 'sujeto_isp', - }, - 'account_tax_template_p_iva10_isp': { - 'name': "IVA 10% Compra con Inversión del Sujeto Pasivo Nacional", - 'l10n_es_type': 'sujeto_isp', - }, - 'account_tax_template_p_iva21_isp': { - 'name': "IVA 21% Compra con Inversión del Sujeto Pasivo Nacional", - 'l10n_es_type': 'sujeto_isp', - }, - 'account_tax_template_p_rp19': { - 'name': "Retenciones 19% (préstamos)", - 'l10n_es_type': 'retencion', - }, - 'account_tax_template_p_rrD19': { - 'name': "Retenciones 19% (reparto de dividendos)", - 'l10n_es_type': 'retencion', - }, - } + return self._parse_csv('es_common', 'account.tax', module='l10n_es_edi_sii') diff --git a/addons/l10n_fr/models/__init__.py b/addons/l10n_fr/models/__init__.py index 0e8bc9ecb76..e7f732174a8 100644 --- a/addons/l10n_fr/models/__init__.py +++ b/addons/l10n_fr/models/__init__.py @@ -1,5 +1,4 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import template_fr -from . import l10n_fr -from . import account_chart_template +from . import res_partner from . import res_company diff --git a/addons/l10n_fr/models/account_chart_template.py b/addons/l10n_fr/models/account_chart_template.py deleted file mode 100644 index f44680ef5d7..00000000000 --- a/addons/l10n_fr/models/account_chart_template.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from odoo import api, models -from odoo.addons.account.models.chart_template import template - - -class AccountChartTemplate(models.AbstractModel): - _inherit = 'account.chart.template' - - @template('fr', 'account.journal') - def _get_fr_account_journal(self): - return { - 'sale': {'refund_sequence': True}, - 'purchase': {'refund_sequence': True}, - } diff --git a/addons/l10n_fr/models/l10n_fr.py b/addons/l10n_fr/models/res_partner.py similarity index 100% rename from addons/l10n_fr/models/l10n_fr.py rename to addons/l10n_fr/models/res_partner.py diff --git a/addons/l10n_fr/models/template_fr.py b/addons/l10n_fr/models/template_fr.py index 12357863dbe..14e0be10d97 100644 --- a/addons/l10n_fr/models/template_fr.py +++ b/addons/l10n_fr/models/template_fr.py @@ -32,6 +32,13 @@ class AccountChartTemplate(models.AbstractModel): }, } + @template('fr', 'account.journal') + def _get_fr_account_journal(self): + return { + 'sale': {'refund_sequence': True}, + 'purchase': {'refund_sequence': True}, + } + @template('fr', 'account.reconcile.model') def _get_fr_reconcile_model(self): return { diff --git a/addons/l10n_in/models/__init__.py b/addons/l10n_in/models/__init__.py index 80a8b8df295..fd1aa5c2811 100644 --- a/addons/l10n_in/models/__init__.py +++ b/addons/l10n_in/models/__init__.py @@ -2,7 +2,6 @@ from . import template_in from . import account from . import account_invoice -from . import chart_template from . import company from . import product_template from . import port_code diff --git a/addons/l10n_in/models/chart_template.py b/addons/l10n_in/models/chart_template.py deleted file mode 100644 index 348cbbb2ee7..00000000000 --- a/addons/l10n_in/models/chart_template.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import models, fields -from odoo.addons.account.models.chart_template import template - - -class AccountChartTemplate(models.AbstractModel): - _inherit = 'account.chart.template' - - @template('in', 'res.company') - def _get_in_res_company(self): - company_data = super()._get_in_res_company() - company_data[self.env.company.id].update({ - 'account_opening_date': fields.Date.context_today(self).replace(month=4, day=1), - 'fiscalyear_last_month': '3', - }) - return company_data diff --git a/addons/l10n_in/models/template_in.py b/addons/l10n_in/models/template_in.py index 258c910b03e..862e0d73357 100644 --- a/addons/l10n_in/models/template_in.py +++ b/addons/l10n_in/models/template_in.py @@ -1,5 +1,5 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import models +from odoo import models, fields from odoo.addons.account.models.chart_template import template @@ -29,5 +29,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'p2117', 'account_journal_early_pay_discount_loss_account_id': 'p2132', 'account_journal_early_pay_discount_gain_account_id': '2012', + 'account_opening_date': fields.Date.context_today(self).replace(month=4, day=1), + 'fiscalyear_last_month': '3', }, } diff --git a/addons/l10n_it/models/__init__.py b/addons/l10n_it/models/__init__.py index c182515bb1b..62a0e21b13d 100644 --- a/addons/l10n_it/models/__init__.py +++ b/addons/l10n_it/models/__init__.py @@ -1,4 +1,3 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import template_it from . import account_report -from . import account_chart_template diff --git a/addons/l10n_it/models/account_chart_template.py b/addons/l10n_it/models/account_chart_template.py deleted file mode 100644 index 19f53e27e90..00000000000 --- a/addons/l10n_it/models/account_chart_template.py +++ /dev/null @@ -1,16 +0,0 @@ -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from odoo import models -from odoo.addons.account.models.chart_template import template - - -class AccountChartTemplate(models.AbstractModel): - _inherit = 'account.chart.template' - - @template('it', 'res.company') - def _get_it_res_company(self): - company_data = super()._get_it_res_company() - company_data[self.env.company.id].update({ - 'tax_calculation_rounding_method': 'round_globally', - }) - return company_data diff --git a/addons/l10n_it/models/template_it.py b/addons/l10n_it/models/template_it.py index f87fd75db66..58d540866e4 100644 --- a/addons/l10n_it/models/template_it.py +++ b/addons/l10n_it/models/template_it.py @@ -28,5 +28,6 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': '4920', 'account_journal_early_pay_discount_loss_account_id': '4111', 'account_journal_early_pay_discount_gain_account_id': '3111', + 'tax_calculation_rounding_method': 'round_globally', }, } diff --git a/addons/l10n_kz/models/__init__.py b/addons/l10n_kz/models/__init__.py index 0356a0b1370..df2eac3eeaf 100644 --- a/addons/l10n_kz/models/__init__.py +++ b/addons/l10n_kz/models/__init__.py @@ -1,3 +1,2 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import template_kz -from . import chart_template diff --git a/addons/l10n_kz/models/chart_template.py b/addons/l10n_kz/models/chart_template.py deleted file mode 100644 index 9deb98d8f78..00000000000 --- a/addons/l10n_kz/models/chart_template.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from odoo import _, models -from odoo.addons.account.models.chart_template import template - - -class AccountChartTemplate(models.AbstractModel): - _inherit = "account.chart.template" - - @template('kz', 'account.journal') - def _get_kz_account_journal(self): - return { - 'cash': {'default_account_id': 'kz1010'}, - 'bank': {'default_account_id': 'kz1030'}, - } diff --git a/addons/l10n_kz/models/template_kz.py b/addons/l10n_kz/models/template_kz.py index 341ede41f90..0ebc3d132f2 100644 --- a/addons/l10n_kz/models/template_kz.py +++ b/addons/l10n_kz/models/template_kz.py @@ -32,3 +32,10 @@ class AccountChartTemplate(models.AbstractModel): 'default_cash_difference_expense_account_id': 'kz7410', }, } + + @template('kz', 'account.journal') + def _get_kz_account_journal(self): + return { + 'cash': {'default_account_id': 'kz1010'}, + 'bank': {'default_account_id': 'kz1030'}, + } diff --git a/addons/l10n_lu/models/__init__.py b/addons/l10n_lu/models/__init__.py index fffa52593b8..5e07ed00534 100644 --- a/addons/l10n_lu/models/__init__.py +++ b/addons/l10n_lu/models/__init__.py @@ -1,3 +1,2 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import template_lu -from . import account_chart_template diff --git a/addons/l10n_lu/models/account_chart_template.py b/addons/l10n_lu/models/account_chart_template.py deleted file mode 100644 index 66c4e13c33a..00000000000 --- a/addons/l10n_lu/models/account_chart_template.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from odoo import api, models -from odoo.addons.account.models.chart_template import template - - -class AccountChartTemplate(models.AbstractModel): - _inherit = 'account.chart.template' - - @template('lu', 'account.journal') - def _get_lu_account_journal(self): - return { - 'sale': {'refund_sequence': True}, - 'purchase': {'refund_sequence': True}, - } diff --git a/addons/l10n_lu/models/template_lu.py b/addons/l10n_lu/models/template_lu.py index 92e09afa5ec..2efc7590757 100644 --- a/addons/l10n_lu/models/template_lu.py +++ b/addons/l10n_lu/models/template_lu.py @@ -36,6 +36,13 @@ class AccountChartTemplate(models.AbstractModel): }, } + @template('lu', 'account.journal') + def _get_lu_account_journal(self): + return { + 'sale': {'refund_sequence': True}, + 'purchase': {'refund_sequence': True}, + } + @template('lu', 'account.reconcile.model') def _get_lu_reconcile_model(self): return { diff --git a/addons/l10n_mx/models/__init__.py b/addons/l10n_mx/models/__init__.py index e64040c1ef0..f98f00df9ca 100644 --- a/addons/l10n_mx/models/__init__.py +++ b/addons/l10n_mx/models/__init__.py @@ -4,4 +4,3 @@ from . import account_tax from . import account_journal from . import res_bank from . import res_config_settings -from . import chart_template diff --git a/addons/l10n_mx/models/chart_template.py b/addons/l10n_mx/models/chart_template.py deleted file mode 100644 index bf159743bbb..00000000000 --- a/addons/l10n_mx/models/chart_template.py +++ /dev/null @@ -1,35 +0,0 @@ -# coding: utf-8 -# Copyright 2016 Vauxoo (https://www.vauxoo.com) -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). - -from odoo import models, _ -from odoo.addons.account.models.chart_template import template - - -class AccountChartTemplate(models.AbstractModel): - _inherit = "account.chart.template" - - @template('mx', 'account.journal') - def _get_mx_account_journal(self): - return { - "cbmx": { - 'type': 'general', - 'name': _('Effectively Paid'), - 'code': 'CBMX', - 'default_account_id': "cuenta118_01", - 'show_on_dashboard': True, - } - } - - @template('mx', 'res.company') - def _get_mx_res_company(self): - company_data = super()._get_mx_res_company() - company_data[self.env.company.id].update({ - 'tax_cash_basis_journal_id': 'cbmx', - }) - return company_data - - - def _setup_utility_bank_accounts(self, template_code, company, template_data): - super()._setup_utility_bank_accounts(template_code, company, template_data) - company.account_journal_suspense_account_id.tag_ids = self.env.ref('l10n_mx.tag_credit_balance_account') diff --git a/addons/l10n_mx/models/template_mx.py b/addons/l10n_mx/models/template_mx.py index fb0223f2f47..f1ba0304eb1 100644 --- a/addons/l10n_mx/models/template_mx.py +++ b/addons/l10n_mx/models/template_mx.py @@ -1,5 +1,5 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import models +from odoo import models, _ from odoo.addons.account.models.chart_template import template @@ -34,5 +34,22 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'cuenta701_01', 'account_journal_early_pay_discount_loss_account_id': 'cuenta9993', 'account_journal_early_pay_discount_gain_account_id': 'cuenta9994', + 'tax_cash_basis_journal_id': 'cbmx', }, } + + @template('mx', 'account.journal') + def _get_mx_account_journal(self): + return { + "cbmx": { + 'type': 'general', + 'name': _('Effectively Paid'), + 'code': 'CBMX', + 'default_account_id': "cuenta118_01", + 'show_on_dashboard': True, + } + } + + def _setup_utility_bank_accounts(self, template_code, company, template_data): + super()._setup_utility_bank_accounts(template_code, company, template_data) + company.account_journal_suspense_account_id.tag_ids = self.env.ref('l10n_mx.tag_credit_balance_account') diff --git a/addons/l10n_sa/models/__init__.py b/addons/l10n_sa/models/__init__.py index 79c7523051b..8dccc2c2238 100644 --- a/addons/l10n_sa/models/__init__.py +++ b/addons/l10n_sa/models/__init__.py @@ -1,4 +1,3 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import template_sa -from . import account_chart_template from . import account_move diff --git a/addons/l10n_sa/models/account_chart_template.py b/addons/l10n_sa/models/account_chart_template.py deleted file mode 100644 index 08cdd1e0222..00000000000 --- a/addons/l10n_sa/models/account_chart_template.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- encoding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import models, Command -from odoo.addons.account.models.chart_template import template - - -class AccountChartTemplate(models.AbstractModel): - _inherit = 'account.chart.template' - - @template('sa', 'account.journal') - def _get_sa_account_journal(self): - """ If Saudi Arabia chart, we add 3 new journals Tax Adjustments, IFRS 16 and Zakat""" - return { - "tax_adjustment": { - 'name': 'Tax Adjustments', - 'code': 'TA', - 'type': 'general', - 'show_on_dashboard': True, - 'sequence': 1, - }, - "ifrs16": { - 'name': 'IFRS 16 Right of Use Asset', - 'code': 'IFRS', - 'type': 'general', - 'show_on_dashboard': True, - 'sequence': 10, - }, - "zakat": { - 'name': 'Zakat', - 'code': 'ZAKAT', - 'type': 'general', - 'show_on_dashboard': True, - 'sequence': 10, - } - } - - @template('sa', 'account.account') - def _get_sa_account_account(self): - return { - "sa_account_100101": {'allowed_journal_ids': [Command.link('ifrs16')]}, - "sa_account_100102": {'allowed_journal_ids': [Command.link('ifrs16')]}, - "sa_account_400070": {'allowed_journal_ids': [Command.link('ifrs16')]}, - "sa_account_201019": {'allowed_journal_ids': [Command.link('zakat')]}, - "sa_account_400072": {'allowed_journal_ids': [Command.link('zakat')]}, - } diff --git a/addons/l10n_sa/models/template_sa.py b/addons/l10n_sa/models/template_sa.py index bbb36be5fb7..6e43988f602 100644 --- a/addons/l10n_sa/models/template_sa.py +++ b/addons/l10n_sa/models/template_sa.py @@ -1,5 +1,5 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import models +from odoo import models, Command from odoo.addons.account.models.chart_template import template @@ -29,3 +29,40 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'sa_account_500011', }, } + + @template('sa', 'account.journal') + def _get_sa_account_journal(self): + """ If Saudi Arabia chart, we add 3 new journals Tax Adjustments, IFRS 16 and Zakat""" + return { + "tax_adjustment": { + 'name': 'Tax Adjustments', + 'code': 'TA', + 'type': 'general', + 'show_on_dashboard': True, + 'sequence': 1, + }, + "ifrs16": { + 'name': 'IFRS 16 Right of Use Asset', + 'code': 'IFRS', + 'type': 'general', + 'show_on_dashboard': True, + 'sequence': 10, + }, + "zakat": { + 'name': 'Zakat', + 'code': 'ZAKAT', + 'type': 'general', + 'show_on_dashboard': True, + 'sequence': 10, + } + } + + @template('sa', 'account.account') + def _get_sa_account_account(self): + return { + "sa_account_100101": {'allowed_journal_ids': [Command.link('ifrs16')]}, + "sa_account_100102": {'allowed_journal_ids': [Command.link('ifrs16')]}, + "sa_account_400070": {'allowed_journal_ids': [Command.link('ifrs16')]}, + "sa_account_201019": {'allowed_journal_ids': [Command.link('zakat')]}, + "sa_account_400072": {'allowed_journal_ids': [Command.link('zakat')]}, + }