diff --git a/addons/account/models/account.py b/addons/account/models/account.py index 7406af80d8e..e344c6a88ba 100644 --- a/addons/account/models/account.py +++ b/addons/account/models/account.py @@ -84,6 +84,16 @@ class AccountAccount(models.Model): ('code_company_uniq', 'unique (code,company_id)', 'The code of the account must be unique per company !') ] + @api.model + def _search_new_account_code(self, company, digits, prefix): + for num in range(1, 100): + new_code = str(prefix.ljust(digits - 1, '0')) + str(num) + rec = self.search([('code', '=', new_code), ('company_id', '=', company.id)], limit=1) + if not rec: + return new_code + else: + raise UserError(_('Cannot generate an unused account code.')) + def _compute_opening_debit_credit(self): for record in self: opening_debit = opening_credit = 0.0 @@ -622,19 +632,12 @@ class AccountJournal(models.Model): account_code_prefix = company.bank_account_code_prefix or '' else: account_code_prefix = company.cash_account_code_prefix or company.bank_account_code_prefix or '' - for num in range(1, 100): - new_code = str(account_code_prefix.ljust(digits - 1, '0')) + str(num) - rec = self.env['account.account'].search([('code', '=', new_code), ('company_id', '=', company.id)], limit=1) - if not rec: - break - else: - raise UserError(_('Cannot generate an unused account code.')) liquidity_type = self.env.ref('account.data_account_type_liquidity') return { 'name': name, 'currency_id': currency_id or False, - 'code': new_code, + 'code': self.env['account.account']._search_new_account_code(company, digits, account_code_prefix), 'user_type_id': liquidity_type and liquidity_type.id or False, 'company_id': company.id, } diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py index 69413f6bd66..fee9c587ca6 100644 --- a/addons/account/models/chart_template.py +++ b/addons/account/models/chart_template.py @@ -110,9 +110,7 @@ class AccountChartTemplate(models.Model): help='List of all the taxes that have to be installed by the wizard') bank_account_code_prefix = fields.Char(string='Prefix of the bank accounts', required=True, oldname="bank_account_code_char") cash_account_code_prefix = fields.Char(string='Prefix of the main cash accounts', required=True) - transfer_account_id = fields.Many2one('account.account.template', string='Transfer Account', required=True, - domain=lambda self: [('reconcile', '=', True), ('user_type_id.id', '=', self.env.ref('account.data_account_type_current_assets').id)], - help="Intermediary account used when moving money from a liquidity account to another") + transfer_account_code_prefix = fields.Char(string='Prefix of the main transfer accounts', required=True) income_currency_exchange_account_id = fields.Many2one('account.account.template', string="Gain Exchange Rate Account", domain=[('internal_type', '=', 'other'), ('deprecated', '=', False)]) expense_currency_exchange_account_id = fields.Many2one('account.account.template', @@ -137,10 +135,10 @@ class AccountChartTemplate(models.Model): 'company_id': self.env.user.company_id.id, 'chart_template_id': self.id, 'code_digits': self.code_digits, - 'transfer_account_id': self.transfer_account_id.id, 'currency_id': self.currency_id.id, 'bank_account_code_prefix': self.bank_account_code_prefix, 'cash_account_code_prefix': self.cash_account_code_prefix, + 'transfer_account_code_prefix': self.transfer_account_code_prefix, }) wizard.onchange_chart_template_id() wizard.execute() @@ -266,12 +264,11 @@ class AccountChartTemplate(models.Model): return True @api.multi - def _install_template(self, company, code_digits=None, transfer_account_id=None, obj_wizard=None, acc_ref=None, taxes_ref=None): + def _install_template(self, company, code_digits=None, obj_wizard=None, acc_ref=None, taxes_ref=None): """ Recursively load the template objects and create the real objects from them. :param company: company the wizard is running for :param code_digits: number of digits the accounts code should have in the COA - :param transfer_account_id: reference to the account template that will be used as intermediary account for transfers between 2 liquidity accounts :param obj_wizard: the current wizard for generating the COA from the templates :param acc_ref: Mapping between ids of account templates and real accounts created from them :param taxes_ref: Mapping between ids of tax templates and real taxes created from them @@ -287,22 +284,21 @@ class AccountChartTemplate(models.Model): if taxes_ref is None: taxes_ref = {} if self.parent_id: - tmp1, tmp2 = self.parent_id._install_template(company, code_digits=code_digits, transfer_account_id=transfer_account_id, acc_ref=acc_ref, taxes_ref=taxes_ref) + tmp1, tmp2 = self.parent_id._install_template(company, code_digits=code_digits, acc_ref=acc_ref, taxes_ref=taxes_ref) acc_ref.update(tmp1) taxes_ref.update(tmp2) # Ensure, even if individually, that everything is translated according to the company's language. - tmp1, tmp2 = self.with_context(lang=company.partner_id.lang)._load_template(company, code_digits=code_digits, transfer_account_id=transfer_account_id, account_ref=acc_ref, taxes_ref=taxes_ref) + tmp1, tmp2 = self.with_context(lang=company.partner_id.lang)._load_template(company, code_digits=code_digits, account_ref=acc_ref, taxes_ref=taxes_ref) acc_ref.update(tmp1) taxes_ref.update(tmp2) return acc_ref, taxes_ref @api.multi - def _load_template(self, company, code_digits=None, transfer_account_id=None, account_ref=None, taxes_ref=None): + def _load_template(self, company, code_digits=None, account_ref=None, taxes_ref=None): """ Generate all the objects from the templates :param company: company the wizard is running for :param code_digits: number of digits the accounts code should have in the COA - :param transfer_account_id: reference to the account template that will be used as intermediary account for transfers between 2 liquidity accounts :param acc_ref: Mapping between ids of account templates and real accounts created from them :param taxes_ref: Mapping between ids of tax templates and real taxes created from them :returns: tuple with a dictionary containing @@ -318,8 +314,6 @@ class AccountChartTemplate(models.Model): taxes_ref = {} if not code_digits: code_digits = self.code_digits - if not transfer_account_id: - transfer_account_id = self.transfer_account_id AccountTaxObj = self.env['account.tax'] # Generate taxes from templates. @@ -331,7 +325,6 @@ class AccountChartTemplate(models.Model): account_ref.update(account_template_ref) # writing account values after creation of accounts - company.transfer_account_id = account_template_ref[transfer_account_id.id] for key, value in generated_tax_res['account_dict'].items(): if value['refund_account_id'] or value['account_id'] or value['cash_basis_account_id'] or value['cash_basis_base_account_id']: AccountTaxObj.browse(key).write({ @@ -694,14 +687,12 @@ class WizardMultiChartsAccounts(models.TransientModel): bank_account_ids = fields.One2many('account.bank.accounts.wizard', 'bank_account_id', string='Cash and Banks', required=True, oldname="bank_accounts_id") bank_account_code_prefix = fields.Char('Bank Accounts Prefix', required=True, oldname="bank_account_code_char") cash_account_code_prefix = fields.Char('Cash Accounts Prefix', required=True) + transfer_account_code_prefix = fields.Char('Transfer Accounts Prefix', required=True) code_digits = fields.Integer(string='# of Digits', required=True, help="No. of Digits to use for account code") sale_tax_id = fields.Many2one('account.tax.template', string='Default Sales Tax', oldname="sale_tax") purchase_tax_id = fields.Many2one('account.tax.template', string='Default Purchase Tax', oldname="purchase_tax") sale_tax_rate = fields.Float(string='Sales Tax(%)') use_anglo_saxon = fields.Boolean(string='Use Anglo-Saxon Accounting', related='chart_template_id.use_anglo_saxon') - transfer_account_id = fields.Many2one('account.account.template', required=True, string='Transfer Account', - domain=lambda self: [('reconcile', '=', True), ('user_type_id.id', '=', self.env.ref('account.data_account_type_current_assets').id)], - help="Intermediary account used when moving money from a liquidity account to another") purchase_tax_rate = fields.Float(string='Purchase Tax(%)') complete_tax_set = fields.Boolean('Complete Set of Taxes', help="This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use " @@ -749,14 +740,14 @@ class WizardMultiChartsAccounts(models.TransientModel): else: self.sale_tax_id = False self.purchase_tax_id = False - if self.chart_template_id.transfer_account_id: - self.transfer_account_id = self.chart_template_id.transfer_account_id.id if self.chart_template_id.code_digits: self.code_digits = self.chart_template_id.code_digits if self.chart_template_id.bank_account_code_prefix: self.bank_account_code_prefix = self.chart_template_id.bank_account_code_prefix if self.chart_template_id.cash_account_code_prefix: self.cash_account_code_prefix = self.chart_template_id.cash_account_code_prefix + if self.chart_template_id.transfer_account_code_prefix: + self.transfer_account_code_prefix = self.chart_template_id.transfer_account_code_prefix return res @api.model @@ -900,6 +891,7 @@ class WizardMultiChartsAccounts(models.TransientModel): 'anglo_saxon_accounting': self.use_anglo_saxon, 'bank_account_code_prefix': self.bank_account_code_prefix, 'cash_account_code_prefix': self.cash_account_code_prefix, + 'transfer_account_code_prefix': self.transfer_account_code_prefix, 'chart_template_id': self.chart_template_id.id}) #set the coa currency to active @@ -917,7 +909,11 @@ class WizardMultiChartsAccounts(models.TransientModel): self._create_tax_templates_from_rates(company.id) # Install all the templates objects and generate the real objects - acc_template_ref, taxes_ref = self.chart_template_id._install_template(company, code_digits=self.code_digits, transfer_account_id=self.transfer_account_id) + acc_template_ref, taxes_ref = self.chart_template_id._install_template(company, code_digits=self.code_digits) + + # Create Transfer account + transfer_account_vals = self._prepare_transfer_account(_('Liquidity Transfers'), company) + company.transfer_account_id = self.env['account.account'].create(transfer_account_vals) # Create Bank journals self._create_bank_journals_from_o2m(company, acc_template_ref) @@ -930,6 +926,30 @@ class WizardMultiChartsAccounts(models.TransientModel): company.account_purchase_tax_id = self.env['account.tax'].search([('type_tax_use', 'in', ('purchase', 'all')), ('company_id', '=', company.id)], limit=1).id return {} + @api.model + def _prepare_transfer_account(self, name, company): + ''' Prepare values to create the transfer account that is ani ntermediary account used when moving money + from a liquidity account to another. + + :param name: The transfer account name. + :param company: The company owning this account. + :return: A dictionary of values to create a new account.account. + ''' + digits = 6 + acc = self.env['account.account'].search([('company_id', '=', company.id)], limit=1) + if acc: + digits = len(acc.code) + + account_code_prefix = company.transfer_account_code_prefix or '' + current_assets_type = self.env.ref('account.data_account_type_current_assets', raise_if_not_found=False) + return { + 'name': name, + 'code': self.env['account.account']._search_new_account_code(company, digits, account_code_prefix), + 'user_type_id': current_assets_type and current_assets_type.id or False, + 'reconcile': True, + 'company_id': company.id, + } + @api.multi def _create_bank_journals_from_o2m(self, company, acc_template_ref): ''' diff --git a/addons/account/models/company.py b/addons/account/models/company.py index 8ae4230a7b2..aa1526d7ce8 100644 --- a/addons/account/models/company.py +++ b/addons/account/models/company.py @@ -23,6 +23,7 @@ class ResCompany(models.Model): chart_template_id = fields.Many2one('account.chart.template', help='The chart template for the company (if any)') bank_account_code_prefix = fields.Char(string='Prefix of the bank accounts', oldname="bank_account_code_char") cash_account_code_prefix = fields.Char(string='Prefix of the cash accounts') + transfer_account_code_prefix = fields.Char(string='Prefix of the transfer accounts') account_sale_tax_id = fields.Many2one('account.tax', string="Default Sale Tax") account_purchase_tax_id = fields.Many2one('account.tax', string="Default Purchase Tax") tax_cash_basis_journal_id = fields.Many2one('account.journal', string="Cash Basis Journal") diff --git a/addons/account/models/res_config_settings.py b/addons/account/models/res_config_settings.py index d4593130d2c..4f3116abd55 100644 --- a/addons/account/models/res_config_settings.py +++ b/addons/account/models/res_config_settings.py @@ -68,7 +68,6 @@ class ResConfigSettings(models.TransientModel): wizard = self.env['wizard.multi.charts.accounts'].create({ 'company_id': self.company_id.id, 'chart_template_id': self.chart_template_id.id, - 'transfer_account_id': self.chart_template_id.transfer_account_id.id, 'code_digits': self.chart_template_id.code_digits, 'sale_tax_rate': 15.0, 'purchase_tax_rate': 15.0, @@ -77,6 +76,7 @@ class ResConfigSettings(models.TransientModel): 'currency_id': self.currency_id.id, 'bank_account_code_prefix': self.chart_template_id.bank_account_code_prefix, 'cash_account_code_prefix': self.chart_template_id.cash_account_code_prefix, + 'transfer_account_code_prefix': self.chart_template_id.transfer_account_code_prefix, }) wizard.onchange_chart_template_id() wizard.execute() diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml index 3389915abc2..fa2ff6d0bc7 100644 --- a/addons/account/views/account_view.xml +++ b/addons/account/views/account_view.xml @@ -1845,10 +1845,10 @@ + - @@ -1872,6 +1872,7 @@ + @@ -2026,12 +2027,12 @@
%%
-
+ diff --git a/addons/l10n_ae/data/l10n_ae_chart_data.xml b/addons/l10n_ae/data/l10n_ae_chart_data.xml index 04640fb76ad..d49b7ec861f 100644 --- a/addons/l10n_ae/data/l10n_ae_chart_data.xml +++ b/addons/l10n_ae/data/l10n_ae_chart_data.xml @@ -1,26 +1,15 @@ - - Transfer account - 100 - - - - U.A.E Chart of Accounts - Standard 6 101 105 + 100 - - - - - Accounts Receivable 102 diff --git a/addons/l10n_ar/data/l10n_ar_chart_data.xml b/addons/l10n_ar/data/l10n_ar_chart_data.xml index 88d865769b8..e005f2292f3 100644 --- a/addons/l10n_ar/data/l10n_ar_chart_data.xml +++ b/addons/l10n_ar/data/l10n_ar_chart_data.xml @@ -6,24 +6,13 @@ Cuentas No Clasificadas - - Cuenta de Transferencia - 13 - - - - Argentina - Plan de Cuentas 6 11 12 + 13 - - - - - diff --git a/addons/l10n_at/data/l10n_at_chart_data.xml b/addons/l10n_at/data/l10n_at_chart_data.xml index 09863fd861d..7eb0dc39ba3 100644 --- a/addons/l10n_at/data/l10n_at_chart_data.xml +++ b/addons/l10n_at/data/l10n_at_chart_data.xml @@ -9,29 +9,18 @@ Sonstige - - - 2809 - - - Transfer Konto - - Austria - Chart of Accounts 6 2800 2700 + 2809 - - - - 0010 diff --git a/addons/l10n_au/data/l10n_au_chart_data.xml b/addons/l10n_au/data/l10n_au_chart_data.xml index 7477b7e0c68..30b549e60e5 100644 --- a/addons/l10n_au/data/l10n_au_chart_data.xml +++ b/addons/l10n_au/data/l10n_au_chart_data.xml @@ -1,22 +1,11 @@ - - Transfers - 11170 - - - - Australian Tax and Account Chart Template (by Willow IT) 1111 1113 + 11170 5 - - - - - diff --git a/addons/l10n_be/data/account_chart_template_data.xml b/addons/l10n_be/data/account_chart_template_data.xml index 62579ed6918..0b813ea780d 100644 --- a/addons/l10n_be/data/account_chart_template_data.xml +++ b/addons/l10n_be/data/account_chart_template_data.xml @@ -1,21 +1,12 @@ - - Transferts - 580 - - - Belgian PCMN 550 570 - + 580 - - - diff --git a/addons/l10n_be/data/account_pcmn_belgium_data.xml b/addons/l10n_be/data/account_pcmn_belgium_data.xml index 1f62bb1d5a7..46cb04d8da8 100644 --- a/addons/l10n_be/data/account_pcmn_belgium_data.xml +++ b/addons/l10n_be/data/account_pcmn_belgium_data.xml @@ -1153,7 +1153,6 @@ Belgian PCMN 6 - diff --git a/addons/l10n_bo/data/l10n_bo_chart_data.xml b/addons/l10n_bo/data/l10n_bo_chart_data.xml index d4480e36de1..70c28ca68fe 100644 --- a/addons/l10n_bo/data/l10n_bo_chart_data.xml +++ b/addons/l10n_bo/data/l10n_bo_chart_data.xml @@ -7,24 +7,14 @@ Cuentas No Clasificadas - - Cuenta de Transferencia - 117 - - - Bolivia - Plan de Cuentas 6 114 111 + 117 - - - - - diff --git a/addons/l10n_br/data/l10n_br_chart_data.xml b/addons/l10n_br/data/l10n_br_chart_data.xml index ef91a53f7eb..05ec37f2087 100644 --- a/addons/l10n_br/data/l10n_br_chart_data.xml +++ b/addons/l10n_br/data/l10n_br_chart_data.xml @@ -2,23 +2,12 @@ - - transferência de Conta - 1.01.01.12.00 - - - - Planilha de Contas Brasileira 6 1.01.01.02.00 1.01.01.01.00 + 1.01.01.12.00 - - - - - diff --git a/addons/l10n_ca/data/account_chart_template_data.xml b/addons/l10n_ca/data/account_chart_template_data.xml index 0694126466f..71b465940b3 100644 --- a/addons/l10n_ca/data/account_chart_template_data.xml +++ b/addons/l10n_ca/data/account_chart_template_data.xml @@ -2,24 +2,13 @@ - - 113 - - Transfer Account - - - Canada - Chart of Accounts 111 112 + 113 - - - - - diff --git a/addons/l10n_ch/data/l10n_ch_chart_data.xml b/addons/l10n_ch/data/l10n_ch_chart_data.xml index a2933bac856..17d632a09a5 100644 --- a/addons/l10n_ch/data/l10n_ch_chart_data.xml +++ b/addons/l10n_ch/data/l10n_ch_chart_data.xml @@ -4,25 +4,15 @@ - - - 1090 - Transferts internes - - - Plan comptable 2015 4 102 100 + 1090 - - - - 1060 diff --git a/addons/l10n_cl/data/l10n_cl_chart_data.xml b/addons/l10n_cl/data/l10n_cl_chart_data.xml index c3526a0e22c..75bd05a2685 100644 --- a/addons/l10n_cl/data/l10n_cl_chart_data.xml +++ b/addons/l10n_cl/data/l10n_cl_chart_data.xml @@ -8,25 +8,15 @@ Cuentas No Clasificadas - - Cuenta de Transferencia - 117 - - - - Chile - Plan de Cuentas 114 111 + 117 6 - - - - diff --git a/addons/l10n_cn_small_business/data/l10n_cn_small_business_chart_data.xml b/addons/l10n_cn_small_business/data/l10n_cn_small_business_chart_data.xml index 3bad4ad291f..9f73fbf2369 100644 --- a/addons/l10n_cn_small_business/data/l10n_cn_small_business_chart_data.xml +++ b/addons/l10n_cn_small_business/data/l10n_cn_small_business_chart_data.xml @@ -13,25 +13,15 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html --> - - - 1012 - - 在途资金 - - 小企业会计科目表(财会[2011]17号《小企业会计准则》) 1001 1002 - + 1012 - - - 其他貨幣資金 1012 diff --git a/addons/l10n_cn_standard/data/l10n_cn_standard_chart_data.xml b/addons/l10n_cn_standard/data/l10n_cn_standard_chart_data.xml index a406aa60f80..b40923ab6c3 100644 --- a/addons/l10n_cn_standard/data/l10n_cn_standard_chart_data.xml +++ b/addons/l10n_cn_standard/data/l10n_cn_standard_chart_data.xml @@ -2,12 +2,6 @@ - - 转让帐户 - 1003 - - - 中国会计科目表 (财会[2006]3号《企业会计准则》 @@ -15,10 +9,7 @@ 1001 1002 - - - - + 1003 diff --git a/addons/l10n_co/data/l10n_co_chart_data.xml b/addons/l10n_co/data/l10n_co_chart_data.xml index 200e89d70ea..309c3785205 100644 --- a/addons/l10n_co/data/l10n_co_chart_data.xml +++ b/addons/l10n_co/data/l10n_co_chart_data.xml @@ -1,23 +1,13 @@ - - Remesas En Tránsito - 1115 - - - Colombian - Generic Chart of Accounts 1110 1105 - - - - - + 1115 diff --git a/addons/l10n_cr/data/l10n_cr_chart_data.xml b/addons/l10n_cr/data/l10n_cr_chart_data.xml index f71c0d6025a..8b88a2eda6d 100644 --- a/addons/l10n_cr/data/l10n_cr_chart_data.xml +++ b/addons/l10n_cr/data/l10n_cr_chart_data.xml @@ -2,22 +2,11 @@ - - 0-1114 - 0-Fondos en tránsito - - - - Costa Rica - Company 0 0-1112 0-1111 + 0-1114 - - - - - diff --git a/addons/l10n_de/models/__init__.py b/addons/l10n_de/models/__init__.py index 3115b7571a9..5f5a7c384f3 100644 --- a/addons/l10n_de/models/__init__.py +++ b/addons/l10n_de/models/__init__.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from . import datev \ No newline at end of file +from . import datev +from . import chart_template diff --git a/addons/l10n_de/models/chart_template.py b/addons/l10n_de/models/chart_template.py new file mode 100644 index 00000000000..670bdfee873 --- /dev/null +++ b/addons/l10n_de/models/chart_template.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +from odoo import api, models, _ + + +class WizardMultiChartsAccounts(models.TransientModel): + _inherit = 'wizard.multi.charts.accounts' + + @api.model + def _prepare_transfer_account(self, name, company): + res = super(WizardMultiChartsAccounts, self)._prepare_transfer_account(name, company) + xml_id = self.env.ref('l10n_de.tag_de_asset_bs_B_III_2').id + existing_tags = [x[-1:] for x in res.get('tag_ids', [])] + res['tag_ids'] = [(6, 0, existing_tags + [xml_id])] + return res diff --git a/addons/l10n_de_skr03/data/l10n_de_skr03_chart_data.xml b/addons/l10n_de_skr03/data/l10n_de_skr03_chart_data.xml index 4c65b4269f3..91698489ee3 100644 --- a/addons/l10n_de_skr03/data/l10n_de_skr03_chart_data.xml +++ b/addons/l10n_de_skr03/data/l10n_de_skr03_chart_data.xml @@ -1,25 +1,12 @@ - - - Finanzwechsel - 1327 - - - - - Deutscher Kontenplan SKR03 1000 1200 + 1327 - - - - - diff --git a/addons/l10n_de_skr04/data/l10n_de_skr04_chart_data.xml b/addons/l10n_de_skr04/data/l10n_de_skr04_chart_data.xml index b776158ef86..b746146667e 100644 --- a/addons/l10n_de_skr04/data/l10n_de_skr04_chart_data.xml +++ b/addons/l10n_de_skr04/data/l10n_de_skr04_chart_data.xml @@ -1,25 +1,12 @@ - - - Finanzwechsel - 1520 - - - - - Deutscher Kontenplan SKR04 1600 1800 + 1520 - - - - - diff --git a/addons/l10n_do/data/l10n_do_chart_data.xml b/addons/l10n_do/data/l10n_do_chart_data.xml index 81d61fe7aa0..b8d5a68ff64 100644 --- a/addons/l10n_do/data/l10n_do_chart_data.xml +++ b/addons/l10n_do/data/l10n_do_chart_data.xml @@ -4,22 +4,13 @@ - - Transferencias de Efectivo - 11010100 - - - Catálogo de Cuentas Dominicano (NIIF) 8 110101 110102 - + 11010100 - - - diff --git a/addons/l10n_ec/data/l10n_ec_chart_data.xml b/addons/l10n_ec/data/l10n_ec_chart_data.xml index d22b6ca88f5..c86c7e83492 100644 --- a/addons/l10n_ec/data/l10n_ec_chart_data.xml +++ b/addons/l10n_ec/data/l10n_ec_chart_data.xml @@ -1,23 +1,12 @@ - - Cuenta de transferencia - 10.01.03 - - - - Ecuador - Chart of Accounts - 10.01.02 10.01.01 + 10.01.03 - - - - diff --git a/addons/l10n_es/data/account_chart_template_data.xml b/addons/l10n_es/data/account_chart_template_data.xml index 8668f831d0c..7f91ca78dcd 100644 --- a/addons/l10n_es/data/account_chart_template_data.xml +++ b/addons/l10n_es/data/account_chart_template_data.xml @@ -1,38 +1,22 @@ - - - - Cuenta de transferencia inter-bancos - 572999 - - - - - PGCE común 570 572 - + 572999 - - - - PGCE PYMEs 2008 570 572 - + 572999 @@ -42,7 +26,7 @@ 570 572 - + 572999 @@ -52,7 +36,7 @@ 570 572 - + 572999 diff --git a/addons/l10n_et/data/l10n_et_chart_data.xml b/addons/l10n_et/data/l10n_et_chart_data.xml index 106f8638da7..73daa2ad63f 100644 --- a/addons/l10n_et/data/l10n_et_chart_data.xml +++ b/addons/l10n_et/data/l10n_et_chart_data.xml @@ -2,23 +2,12 @@ - - Transfer account - 212 - - - - Ethiopia Tax and Account Chart Template 6 211 211 - - - - - + 212 diff --git a/addons/l10n_fr/data/l10n_fr_chart_data.xml b/addons/l10n_fr/data/l10n_fr_chart_data.xml index eadc305bc34..3b8ae445e62 100644 --- a/addons/l10n_fr/data/l10n_fr_chart_data.xml +++ b/addons/l10n_fr/data/l10n_fr_chart_data.xml @@ -1,12 +1,5 @@ - - Virements Internes - 58 - - - - Plan Comptable Général (France) @@ -14,11 +7,7 @@ 512 53 - + 58 - - - - diff --git a/addons/l10n_generic_coa/data/l10n_generic_coa_chart_data.xml b/addons/l10n_generic_coa/data/l10n_generic_coa_chart_data.xml index cc989f76ac5..d621c45acbb 100644 --- a/addons/l10n_generic_coa/data/l10n_generic_coa_chart_data.xml +++ b/addons/l10n_generic_coa/data/l10n_generic_coa_chart_data.xml @@ -1,25 +1,14 @@ - - - 1017 - Liquidity Transfers - - - - Configurable Account Chart Template 6 1014 1015 - + 1017 - - - diff --git a/addons/l10n_gr/data/l10n_gr_chart_data.xml b/addons/l10n_gr/data/l10n_gr_chart_data.xml index 0d8d3195984..88bfbe88031 100644 --- a/addons/l10n_gr/data/l10n_gr_chart_data.xml +++ b/addons/l10n_gr/data/l10n_gr_chart_data.xml @@ -3,22 +3,13 @@ - - 38.07 - Η μεταφορά λογαριασμού - - - Πρότυπο Ελληνικού Λογιστικού Σχεδίου 38 38 + 38.07 6 - - - - diff --git a/addons/l10n_gt/data/l10n_gt_chart_data.xml b/addons/l10n_gt/data/l10n_gt_chart_data.xml index 3feecab930b..3cb12702d2e 100644 --- a/addons/l10n_gt/data/l10n_gt_chart_data.xml +++ b/addons/l10n_gt/data/l10n_gt_chart_data.xml @@ -1,26 +1,15 @@ - - 1.0.03.01 - Cuenta de Transferencia - - - - Plantilla de cuentas de Guatemala (sencilla) 1.0.01.0 1.0.02.0 + 1.0.03.01 9 - - - - - diff --git a/addons/l10n_hk/data/account_chart_template_data.xml b/addons/l10n_hk/data/account_chart_template_data.xml index dfaed9705fb..9ab9856b36b 100644 --- a/addons/l10n_hk/data/account_chart_template_data.xml +++ b/addons/l10n_hk/data/account_chart_template_data.xml @@ -4,23 +4,13 @@ - - Transfer Account - 111220 - - - - Hong Kong - Chart of Accounts 1200 1210 + 111220 6 - - - - diff --git a/addons/l10n_hk/data/l10n_hk_chart_data.xml b/addons/l10n_hk/data/l10n_hk_chart_data.xml index 0e2458c20e3..1d5ced02947 100644 --- a/addons/l10n_hk/data/l10n_hk_chart_data.xml +++ b/addons/l10n_hk/data/l10n_hk_chart_data.xml @@ -509,7 +509,6 @@ Hong Kong - Chart of Accounts - diff --git a/addons/l10n_hn/data/l10n_hn_chart_data.xml b/addons/l10n_hn/data/l10n_hn_chart_data.xml index 20cb1f98ee8..b3554b02cfa 100644 --- a/addons/l10n_hn/data/l10n_hn_chart_data.xml +++ b/addons/l10n_hn/data/l10n_hn_chart_data.xml @@ -1,22 +1,13 @@ - - 1.1.01.00 - Cuenta de Transferencia - - - Plantilla de cuentas de Honduras (sencilla) 1.1.01. 1.1.01. + 1.1.01.00 9 - - - - diff --git a/addons/l10n_hr/data/l10n_hr_chart_data.xml b/addons/l10n_hr/data/l10n_hr_chart_data.xml index 3e78613d02b..82ccb4abdf9 100644 --- a/addons/l10n_hr/data/l10n_hr_chart_data.xml +++ b/addons/l10n_hr/data/l10n_hr_chart_data.xml @@ -5,22 +5,13 @@ - - 1009 - Žiro-račun prijelazni konto - - - RRIF-ov računski plan za poduzetnike 101 102 + 1009 0 - - - - diff --git a/addons/l10n_hu/data/l10n_hu_chart_data.xml b/addons/l10n_hu/data/l10n_hu_chart_data.xml index 1b1c3d049f1..0d8b0341a3b 100644 --- a/addons/l10n_hu/data/l10n_hu_chart_data.xml +++ b/addons/l10n_hu/data/l10n_hu_chart_data.xml @@ -2,21 +2,12 @@ - - 389 - Átvezetési számla - - - Magyar főkönyvi kivonat 4 381 384 + 389 - - - - \ No newline at end of file diff --git a/addons/l10n_in/data/l10n_in_chart_data.xml b/addons/l10n_in/data/l10n_in_chart_data.xml index bb6665970ac..f580692759a 100644 --- a/addons/l10n_in/data/l10n_in_chart_data.xml +++ b/addons/l10n_in/data/l10n_in_chart_data.xml @@ -2,23 +2,14 @@ - - 1008 - Transfer Account - - - Indian Chart of Accounts - Standard 1002 1001 + 1008 6 - - - - SGST diff --git a/addons/l10n_in_schedule6/l10n_in_schedule6_chart.xml b/addons/l10n_in_schedule6/l10n_in_schedule6_chart.xml index 1b3ce822d00..f8e8c8f3899 100644 --- a/addons/l10n_in_schedule6/l10n_in_schedule6_chart.xml +++ b/addons/l10n_in_schedule6/l10n_in_schedule6_chart.xml @@ -1,22 +1,13 @@ - - 1206 - Transfer Account - - - Indian Chart of Accounts - Schedule VI 12142 12141 + 1206 6 - - - - diff --git a/addons/l10n_it/data/l10n_it_chart_data.xml b/addons/l10n_it/data/l10n_it_chart_data.xml index a0b635c4613..d05183c2215 100644 --- a/addons/l10n_it/data/l10n_it_chart_data.xml +++ b/addons/l10n_it/data/l10n_it_chart_data.xml @@ -1,22 +1,13 @@ - - 183 - conto di trasferimento - - - Italy - Generic Chart of Accounts 180 182 + 183 - - - - diff --git a/addons/l10n_jp/data/l10n_jp_chart_data.xml b/addons/l10n_jp/data/l10n_jp_chart_data.xml index 5769637ccba..860b116acf8 100644 --- a/addons/l10n_jp/data/l10n_jp_chart_data.xml +++ b/addons/l10n_jp/data/l10n_jp_chart_data.xml @@ -3,22 +3,13 @@ - - A11109 - 振替口座 - - - 日本勘定設定テンプレート 7 A11102 A11105 + A11109 - - - - diff --git a/addons/l10n_lu/data/l10n_lu_chart_data.xml b/addons/l10n_lu/data/l10n_lu_chart_data.xml index 3930e4cdd5a..537b6210167 100644 --- a/addons/l10n_lu/data/l10n_lu_chart_data.xml +++ b/addons/l10n_lu/data/l10n_lu_chart_data.xml @@ -2,22 +2,13 @@ - - 517 - Internal transfers - - - PCMN Luxembourg 513 516 + 517 6 - - - - diff --git a/addons/l10n_ma/data/l10n_ma_chart_data.xml b/addons/l10n_ma/data/l10n_ma_chart_data.xml index 089d50be103..d72021c2ae4 100644 --- a/addons/l10n_ma/data/l10n_ma_chart_data.xml +++ b/addons/l10n_ma/data/l10n_ma_chart_data.xml @@ -8,22 +8,13 @@ --> - - Virement de fonds - 5115 - - - Plan comptable marocain 6 5141 5161 - - - - + 5115 diff --git a/addons/l10n_mx/data/l10n_mx_chart_data.xml b/addons/l10n_mx/data/l10n_mx_chart_data.xml index 5465175a2cc..909c1dbc6a3 100644 --- a/addons/l10n_mx/data/l10n_mx_chart_data.xml +++ b/addons/l10n_mx/data/l10n_mx_chart_data.xml @@ -4,28 +4,18 @@ - - Transferencias bancarias moneda nacional - 102.01.01 - - - - Plan de Cuentas para Mexico 102.01.0 101.01.0 + 102.01.01 3 - - - - Transferencias bancarias moneda extranjera 102.02.01 diff --git a/addons/l10n_mx/models/chart_template.py b/addons/l10n_mx/models/chart_template.py index d6607a7a359..839f4dbe2e9 100644 --- a/addons/l10n_mx/models/chart_template.py +++ b/addons/l10n_mx/models/chart_template.py @@ -40,3 +40,15 @@ class AccountChartTemplate(models.Model): 'show_on_dashboard': True, }) return res + + +class WizardMultiChartsAccounts(models.TransientModel): + _inherit = 'wizard.multi.charts.accounts' + + @api.model + def _prepare_transfer_account(self, name, company): + res = super(WizardMultiChartsAccounts, self)._prepare_transfer_account(name, company) + xml_id = self.env.ref('l10n_mx.account_tag_102_01').id + existing_tags = [x[-1:] for x in res.get('tag_ids', [])] + res['tag_ids'] = [(6, 0, existing_tags + [xml_id])] + return res diff --git a/addons/l10n_nl/data/account_chart_template.xml b/addons/l10n_nl/data/account_chart_template.xml index 36ec72853e2..6ce5f16932c 100644 --- a/addons/l10n_nl/data/account_chart_template.xml +++ b/addons/l10n_nl/data/account_chart_template.xml @@ -3,25 +3,13 @@ - - Kruisposten - 1060 - - - - - Nederlands Grootboekschema 101 103 + 1060 6 - - - - - diff --git a/addons/l10n_nl/models/account_chart_template.py b/addons/l10n_nl/models/account_chart_template.py index 50d3f62a812..9da69b2ab0d 100644 --- a/addons/l10n_nl/models/account_chart_template.py +++ b/addons/l10n_nl/models/account_chart_template.py @@ -14,3 +14,11 @@ class WizardMultiChartsAccounts(models.TransientModel): if account: account.tag_ids = [(4, self.env.ref('l10n_nl.account_tag_12').id)] return res + + @api.model + def _prepare_transfer_account(self, name, company): + res = super(WizardMultiChartsAccounts, self)._prepare_transfer_account(name, company) + xml_id = self.env.ref('l10n_nl.account_tag_25').id + existing_tags = [x[-1:] for x in res.get('tag_ids', [])] + res['tag_ids'] = [(6, 0, existing_tags + [xml_id])] + return res diff --git a/addons/l10n_no/data/l10n_no_chart_data.xml b/addons/l10n_no/data/l10n_no_chart_data.xml index 7cafc8048fd..069607d47df 100644 --- a/addons/l10n_no/data/l10n_no_chart_data.xml +++ b/addons/l10n_no/data/l10n_no_chart_data.xml @@ -6,25 +6,14 @@ - - 1940 - - - Bank i transfer - - Norway's Chart of Accounts 1900 1920 + 1940 4 - - - - - diff --git a/addons/l10n_nz/data/l10n_nz_chart_data.xml b/addons/l10n_nz/data/l10n_nz_chart_data.xml index d07bed10581..09c5fa6c71f 100644 --- a/addons/l10n_nz/data/l10n_nz_chart_data.xml +++ b/addons/l10n_nz/data/l10n_nz_chart_data.xml @@ -3,24 +3,13 @@ - - Transfers - 11170 - - - - New Zealand Tax and Account Chart Template (by Willow IT) 1111 1113 + 11170 5 - - - - - diff --git a/addons/l10n_pa/data/l10n_pa_chart_data.xml b/addons/l10n_pa/data/l10n_pa_chart_data.xml index 7c4bbf082e2..7cc95c17ee0 100644 --- a/addons/l10n_pa/data/l10n_pa_chart_data.xml +++ b/addons/l10n_pa/data/l10n_pa_chart_data.xml @@ -4,25 +4,14 @@ Cuentas No Clasificadas - - Cuentas de Transferencia - 112. - - - - Panamá - Plan de Cuentas 111. 113. + 112. 7 - - - - - diff --git a/addons/l10n_pe/data/l10n_pe_chart_data.xml b/addons/l10n_pe/data/l10n_pe_chart_data.xml index 49b4463716c..6c29c4b33a9 100644 --- a/addons/l10n_pe/data/l10n_pe_chart_data.xml +++ b/addons/l10n_pe/data/l10n_pe_chart_data.xml @@ -18,28 +18,17 @@ Gastos por Tributos Valuación y Deterioro de Activos y Provisiones - - Caja y bancos - Efectivo en tránsito - 103000 - - - - Peru - Plan de Cuentas 2011 104 101 + 103000 6 - - - - - Caja y ...- Fondos fijos / caja chica 01 PEN (S/.)102.001 Caja y ...- Certificados bancarios / certificados bancarios ** otros equivalentes de efectivos 105100 Caja y ...- Certificados bancarios / otros105200 diff --git a/addons/l10n_pl/data/l10n_pl_chart_data.xml b/addons/l10n_pl/data/l10n_pl_chart_data.xml index 5493a9085c5..034331e681c 100644 --- a/addons/l10n_pl/data/l10n_pl_chart_data.xml +++ b/addons/l10n_pl/data/l10n_pl_chart_data.xml @@ -14,13 +14,6 @@ Pozabilansowe - - - 11-090-000 - - - Środki pieniężne w drodze - @@ -29,13 +22,10 @@ 11-000-000 12-000-000 - + 11-090-000 - - - 01-010-000 diff --git a/addons/l10n_pt/data/l10n_pt_chart_data.xml b/addons/l10n_pt/data/l10n_pt_chart_data.xml index 563c713990e..ed555f8a5a8 100644 --- a/addons/l10n_pt/data/l10n_pt_chart_data.xml +++ b/addons/l10n_pt/data/l10n_pt_chart_data.xml @@ -2,23 +2,12 @@ - - Contas de transferência - 15 - - - - Portugal - Template do Plano de Contas SNC 11 12 + 15 - - - - - diff --git a/addons/l10n_ro/data/l10n_ro_chart_data.xml b/addons/l10n_ro/data/l10n_ro_chart_data.xml index ceccc8bb1fa..c5cf25a68d5 100644 --- a/addons/l10n_ro/data/l10n_ro_chart_data.xml +++ b/addons/l10n_ro/data/l10n_ro_chart_data.xml @@ -6,29 +6,18 @@ CONTURI IN AFARA BILANTULUI - - Viramente interne - 581 - - - - Romania - Chart of Accounts 512 531 + 581 6 - - - - - Capital subscris nevărsat 1011 diff --git a/addons/l10n_sa/data/account_chart_template_data.xml b/addons/l10n_sa/data/account_chart_template_data.xml index bd6c3a3597d..ea76788f923 100644 --- a/addons/l10n_sa/data/account_chart_template_data.xml +++ b/addons/l10n_sa/data/account_chart_template_data.xml @@ -1,23 +1,12 @@ - - Transfer Account - 18 - - - - Saudi Arabia - Chart of Accounts 1 1 + 18 6 - - - - - diff --git a/addons/l10n_sg/data/l10n_sg_chart_data.xml b/addons/l10n_sg/data/l10n_sg_chart_data.xml index 12fd0eed68e..18211be23f8 100644 --- a/addons/l10n_sg/data/l10n_sg_chart_data.xml +++ b/addons/l10n_sg/data/l10n_sg_chart_data.xml @@ -2,24 +2,13 @@ - - Transfer Accounts - 101100 - - - - Singapore Chart of Accounts - Standard 10140 10141 + 101100 6 - - - - - diff --git a/addons/l10n_si/data/l10n_si_chart_data.xml b/addons/l10n_si/data/l10n_si_chart_data.xml index 7e986517995..0e5c0958382 100644 --- a/addons/l10n_si/data/l10n_si_chart_data.xml +++ b/addons/l10n_si/data/l10n_si_chart_data.xml @@ -2,21 +2,12 @@ - - DENAR NA POTI - 109 - - - Kontni načrt za gospodarske družbe 110 100 + 109 6 - - - - diff --git a/addons/l10n_syscohada/data/l10n_syscohada_chart_data.xml b/addons/l10n_syscohada/data/l10n_syscohada_chart_data.xml index 17267c5f5be..43d34e08653 100644 --- a/addons/l10n_syscohada/data/l10n_syscohada_chart_data.xml +++ b/addons/l10n_syscohada/data/l10n_syscohada_chart_data.xml @@ -4,24 +4,14 @@ Comptes spéciaux - - - AUTRES VIREMENTS INTERNES - 588 - - - SYSCOHADA - Plan de compte 52 51 + 588 6 - - - - diff --git a/addons/l10n_th/data/l10n_th_chart_data.xml b/addons/l10n_th/data/l10n_th_chart_data.xml index 94c094695f8..b919aabc83d 100644 --- a/addons/l10n_th/data/l10n_th_chart_data.xml +++ b/addons/l10n_th/data/l10n_th_chart_data.xml @@ -13,21 +13,12 @@ - - Transfer Account - 16 - - - Thailand - Chart of Accounts 1100 1110 + 16 - - - - diff --git a/addons/l10n_tr/data/l10n_tr_chart_data.xml b/addons/l10n_tr/data/l10n_tr_chart_data.xml index de4f1daff3b..ca0020ca646 100644 --- a/addons/l10n_tr/data/l10n_tr_chart_data.xml +++ b/addons/l10n_tr/data/l10n_tr_chart_data.xml @@ -1,22 +1,13 @@ - - Verilen Çekler ve Ödeme Emirleri - 103 - - - Tek Düzen Hesap Planı 102 100 + 103 6 - - - - diff --git a/addons/l10n_uk/data/l10n_uk_chart_data.xml b/addons/l10n_uk/data/l10n_uk_chart_data.xml index fd180996726..70a81b228a2 100644 --- a/addons/l10n_uk/data/l10n_uk_chart_data.xml +++ b/addons/l10n_uk/data/l10n_uk_chart_data.xml @@ -2,24 +2,13 @@ - - Transfer Account - 1220 - - - - UK Tax and Account Chart Template (by SmartMode) 1200 1210 + 1220 6 - - - - - diff --git a/addons/l10n_uy/data/l10n_uy_chart_data.xml b/addons/l10n_uy/data/l10n_uy_chart_data.xml index e44eb91fbd9..75567cfcaec 100644 --- a/addons/l10n_uy/data/l10n_uy_chart_data.xml +++ b/addons/l10n_uy/data/l10n_uy_chart_data.xml @@ -3,27 +3,15 @@ - - 11120 - - Movimientos Banco (def) - - - Plan de Cuentas Uruguay - Template 6 1111 1112 + 11120 - - - - - - 11201 diff --git a/addons/l10n_ve/data/l10n_ve_chart_data.xml b/addons/l10n_ve/data/l10n_ve_chart_data.xml index 80005380467..26dfd140706 100644 --- a/addons/l10n_ve/data/l10n_ve_chart_data.xml +++ b/addons/l10n_ve/data/l10n_ve_chart_data.xml @@ -1,27 +1,17 @@ - - 1129003 - TRANSFERENCIAS BANCARIAS - - - - Venezuelan - Account 1113 1111 + 1129003 7 - - - - 1115001 PAPELES COMERCIALES diff --git a/addons/l10n_vn/data/l10n_vn_chart_data.xml b/addons/l10n_vn/data/l10n_vn_chart_data.xml index 359c9afc996..0748dd1531e 100644 --- a/addons/l10n_vn/data/l10n_vn_chart_data.xml +++ b/addons/l10n_vn/data/l10n_vn_chart_data.xml @@ -3,13 +3,6 @@ - - Tiền đang chuyển - 113 - - - - VN - Chart of Accounts @@ -17,11 +10,7 @@ 112 111 - - - - - + 113