diff options
| author | Laurent Smet <las@odoo.com> | 2018-05-22 11:04:24 +0200 |
|---|---|---|
| committer | qdp-odoo <qdp@odoo.com> | 2018-05-23 15:43:39 +0200 |
| commit | 7a31a92afa9a2ad280a6ec110fc9547e48b89466 (patch) | |
| tree | 27da1d1466cc8b74116ed775050ee8ceb03d9c5c /addons | |
| parent | 5766fac3886fedf9fdfba2307edbab3b033fb1b5 (diff) | |
[ADD] account, l10n_*: create transfer account based on prefix.
This commit changes the mechanism to get the transfer account.
As the bank/cash accounts, the transfer account is now created automatically based on
a prefix.
-task: https://www.odoo.com/web#id=35857&action=333&active_id=967&model=project.task&view_type=form&menu_id=4720
Diffstat (limited to 'addons')
64 files changed, 147 insertions, 641 deletions
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 @@ <field name="parent_id" /> <field name="bank_account_code_prefix"/> <field name="cash_account_code_prefix"/> + <field name="transfer_account_code_prefix"/> <field name="code_digits" /> <field name="visible" /> <field name="complete_tax_set" /> - <field name="transfer_account_id"/> </group> <separator string="Default Taxes" colspan="4"/> <field name="tax_template_ids" colspan="4" nolabel="1"/> @@ -1872,6 +1872,7 @@ <field name="name" string="Account Template"/> <field name="bank_account_code_prefix"/> <field name="cash_account_code_prefix"/> + <field name="transfer_account_code_prefix"/> <group expand="0" string="Group By"> <filter string="Receivable Account" name="receivalbeacc" domain="[]" context="{'group_by':'property_account_receivable_id'}"/> <filter string="Payable Account" name="payableacc" domain="[]" context="{'group_by':'property_account_payable_id'}"/> @@ -2026,12 +2027,12 @@ <div attrs="{'invisible': [('complete_tax_set', '=', True)]}"> <field name="purchase_tax_rate" class="oe_inline"/> %% </div> - <field name="transfer_account_id"/> </group> <group groups="account.group_account_user" invisible="1"> <field name="code_digits"/> <field name="bank_account_code_prefix"/> <field name="cash_account_code_prefix"/> + <field name="transfer_account_code_prefix"/> </group> </group> </group> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> - <record model="account.account.template" id="transfer_account_id"> - <field name="name">Transfer account</field> - <field name="code">100</field> - <field name="user_type_id" ref="account.data_account_type_current_assets" /> - <field name="reconcile" eval="True" /> - </record> - <record id="uae_chart_template_standard" model="account.chart.template"> <field name="name">U.A.E Chart of Accounts - Standard</field> <field name="code_digits">6</field> <field name="bank_account_code_prefix">101</field> <field name="cash_account_code_prefix">105</field> + <field name="transfer_account_code_prefix">100</field> <field name="currency_id" ref="base.AED" /> - <field name="transfer_account_id" ref="transfer_account_id"/> <field name="complete_tax_set" eval="False"/> </record> - <record model="account.account.template" id="transfer_account_id"> - <field name="chart_template_id" ref="uae_chart_template_standard"/> - </record> - <record model="account.account.template" id="uae_account_3681"> <field name="name">Accounts Receivable</field> <field name="code">102</field> 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 @@ <field name="name">Cuentas No Clasificadas</field> </record> - <record id="transfer_account_id" model="account.account.template"> - <field name="name">Cuenta de Transferencia</field> - <field name="code">13</field> - <field name="reconcile" eval="True"/> - <field ref="account.data_account_type_current_assets" name="user_type_id"/> - </record> - <record id="ar_chart_template" model="account.chart.template"> <field name="name">Argentina - Plan de Cuentas</field> <field name="code_digits">6</field> <field name="bank_account_code_prefix">11</field> <field name="cash_account_code_prefix">12</field> + <field name="transfer_account_code_prefix">13</field> <field name="currency_id" ref="base.ARS"/> - <field name="transfer_account_id" ref="transfer_account_id"/> - </record> - - <record id="transfer_account_id" model="account.account.template"> - <field name="chart_template_id" ref="ar_chart_template"/> </record> <!-- Account Templates --> 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 @@ <field name="name">Sonstige</field> </record> - - <record id="transfer_account_id" model="account.account.template"> - <field name="code">2809</field> - <field name="reconcile" eval="True"/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - <field name="name">Transfer Konto</field> - </record> - <!-- Chart template --> <record id="austria_chart_template" model="account.chart.template"> <field name="name">Austria - Chart of Accounts</field> <field name="code_digits">6</field> <field name="bank_account_code_prefix">2800</field> <field name="cash_account_code_prefix">2700</field> + <field name="transfer_account_code_prefix">2809</field> <field name="currency_id" ref="base.EUR"/> - <field name="transfer_account_id" ref="transfer_account_id"/> </record> <!-- Österreichischer Einheitskontenrahmen 2010 --> <!-- Klasse 0000 Anlagevermögen --> - <record id="transfer_account_id" model="account.account.template"> - <field name="chart_template_id" ref="austria_chart_template"/> - </record> <record id="chart0010" model="account.account.template"> <field name="code">0010</field> <field name="reconcile" eval="False"/> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> - <record id="au_11170" model="account.account.template"> - <field name="name">Transfers</field> - <field name="code">11170</field> - <field name="reconcile" eval="True"/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> - <record id="l10n_au_chart_template" model="account.chart.template"> <field name="name">Australian Tax and Account Chart Template (by Willow IT)</field> <field name="bank_account_code_prefix">1111</field> <field name="cash_account_code_prefix">1113</field> + <field name="transfer_account_code_prefix">11170</field> <field name="code_digits">5</field> <field name="currency_id" ref="base.AUD"/> - <field name="transfer_account_id" ref="au_11170"/> - </record> - - <record id="au_11170" model="account.account.template"> - <field name="chart_template_id" ref="l10n_au_chart_template"/> </record> </odoo> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> - <record id="trans" model="account.account.template"> - <field name="name">Transferts</field> - <field name="code">580</field> - <field name="reconcile" eval="True"/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> <!-- Chart template --> <record id="l10nbe_chart_template" model="account.chart.template"> <field name="name">Belgian PCMN</field> <field name="bank_account_code_prefix">550</field> <field name="cash_account_code_prefix">570</field> - <field name="transfer_account_id" ref="trans"/> + <field name="transfer_account_code_prefix">580</field> <field name="currency_id" ref="base.EUR"/> <field name="spoken_languages" eval="'nl_BE'"/> </record> - <record id="trans" model="account.account.template"> - <field name="chart_template_id" ref="l10nbe_chart_template"/> - </record> </odoo> 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 @@ <record id="l10nbe_chart_template" model="account.chart.template"> <field name="name">Belgian PCMN</field> <field name="code_digits">6</field> - <field name="transfer_account_id" ref="trans"/> <field name="property_account_receivable_id" ref="a4000"/> <field name="property_account_payable_id" ref="a440"/> <field name="property_account_expense_categ_id" ref="a600"/> 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 @@ <record id="account_account_type_NCLASIFICADO" model="account.account.type"> <field name="name">Cuentas No Clasificadas</field> </record> - <record id="transfer_account_id" model="account.account.template"> - <field name="name">Cuenta de Transferencia</field> - <field name="code">117</field> - <field name="reconcile" eval="True"/> - <field ref="account.data_account_type_current_assets" name="user_type_id"/> - </record> <record id="bo_chart_template" model="account.chart.template"> <field name="name">Bolivia - Plan de Cuentas</field> <field name="code_digits">6</field> <field name="bank_account_code_prefix">114</field> <field name="cash_account_code_prefix">111</field> + <field name="transfer_account_code_prefix">117</field> <field name="currency_id" ref="base.BOB"/> - <field name="transfer_account_id" ref="transfer_account_id"/> - </record> - - <record id="transfer_account_id" model="account.account.template"> - <field name="chart_template_id" ref="bo_chart_template"/> </record> <!-- Account Templates --> 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 @@ <odoo> <menuitem id="account_reports_br_statements_menu" name="Brazil" parent="account.menu_finance_reports" sequence="0" groups="account.group_account_user"/> - <record id="transfer_account_id" model="account.account.template"> - <field name="name">transferência de Conta</field> - <field name="code">1.01.01.12.00</field> - <field name="reconcile" eval="True"/> - <field ref="account.data_account_type_current_assets" name="user_type_id"/> - </record> - <record id="l10n_br_account_chart_template" model="account.chart.template"> <field name="name">Planilha de Contas Brasileira</field> <field name="code_digits">6</field> <field name="bank_account_code_prefix">1.01.01.02.00</field> <field name="cash_account_code_prefix">1.01.01.01.00</field> + <field name="transfer_account_code_prefix">1.01.01.12.00</field> <field name="currency_id" ref="base.BRL"/> - <field name="transfer_account_id" ref="transfer_account_id"/> </record> - - <record id="transfer_account_id" model="account.account.template"> - <field name="chart_template_id" ref="l10n_br_account_chart_template"/> - </record> </odoo> 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 @@ <odoo> <!-- Chart template for en --> - <record id="chart113_en" model="account.account.template"> - <field name="code">113</field> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - <field name="name">Transfer Account</field> - <field name="reconcile" eval="True"/> - </record> - <record id="ca_en_chart_template_en" model="account.chart.template"> <field name="name">Canada - Chart of Accounts</field> <field name="cash_account_code_prefix">111</field> <field name="bank_account_code_prefix">112</field> + <field name="transfer_account_code_prefix">113</field> <field name="currency_id" ref="base.CAD"/> <field name="use_anglo_saxon" eval="True"/> <field name="spoken_languages" eval="'fr_CA'"/> - <field name="transfer_account_id" ref="chart113_en"/> - </record> - - <record id="chart113_en" model="account.account.template"> - <field name="chart_template_id" ref="ca_en_chart_template_en"/> </record> </odoo> 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 @@ <data noupdate="1"> <!-- Account Tags --> - - <record id="transfer_account_id" model="account.account.template"> - <field name="code">1090</field> - <field name="name">Transferts internes</field> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - <field eval="True" name="reconcile"/> - </record> <record id="l10nch_chart_template" model="account.chart.template"> <field name="name">Plan comptable 2015</field> <field name="code_digits">4</field> <field name="bank_account_code_prefix">102</field> <field name="cash_account_code_prefix">100</field> + <field name="transfer_account_code_prefix">1090</field> <field name="currency_id" ref="base.CHF"/> - <field name="transfer_account_id" ref="transfer_account_id"/> <field name="spoken_languages" eval="'it_IT;de_DE;de_CH'"/> </record> - <record id="transfer_account_id" model="account.account.template"> - <field name="chart_template_id" ref="l10nch_chart_template"/> - </record> <!-- Accounts Templates --> <record id="ch_coa_1060" model="account.account.template"> <field name="code">1060</field> 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 @@ <field name="name">Cuentas No Clasificadas</field> </record> - <record id="117" model="account.account.template"> - <field name="name">Cuenta de Transferencia</field> - <field name="code">117</field> - <field name="reconcile" eval="True"/> - <field ref="account.data_account_type_current_assets" name="user_type_id"/> - </record> - <record id="cl_chart_template" model="account.chart.template"> <field name="name">Chile - Plan de Cuentas</field> <field name="bank_account_code_prefix">114</field> <field name="cash_account_code_prefix">111</field> + <field name="transfer_account_code_prefix">117</field> <field name="code_digits">6</field> <field name="currency_id" ref="base.CLP"/> - <field name="transfer_account_id" ref="117"/> </record> - <record id="117" model="account.account.template"> - <field name="chart_template_id" ref="cl_chart_template"/> - </record> <!-- Account Templates --> <record id="113_001" model="account.account.template"> 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,26 +13,16 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html --> <data noupdate="1"> - - <record id="l10n_cn_1012" model="account.account.template"> - <field name="code">1012</field> - <field eval="False" name="reconcile"/> - <field name="name">在途资金</field> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> <record id="l10n_chart_china_small_business" model="account.chart.template"> <field name="name">小企业会计科目表(财会[2011]17号《小企业会计准则》)</field> <field name="code_digits" eval="6"/> <field name="currency_id" ref="base.CNY"/> <field name="cash_account_code_prefix">1001</field> <field name="bank_account_code_prefix">1002</field> - <field name="transfer_account_id" ref="l10n_cn_1012"/> + <field name="transfer_account_code_prefix">1012</field> <field name="spoken_languages" eval="'en_US'"/> </record> <record id="l10n_cn_1012" model="account.account.template"> - <field name="chart_template_id" ref="l10n_chart_china_small_business"/> - </record> - <record id="l10n_cn_1012" model="account.account.template"> <field name="name">其他貨幣資金</field> <field name="code">1012</field> <field name="reconcile" eval="False"/> 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 @@ <odoo> <data noupdate="1"> - <record id="account_1003" model="account.account.template"> - <field name="name">转让帐户</field> - <field name="code">1003</field> - <field name="reconcile" eval="True" /> - <field name="user_type_id" ref="account.data_account_type_current_assets" /> - </record> <!-- Chart template --> <record id="l10n_chart_china_standard_business" model="account.chart.template"> <field name="name">中国会计科目表 (财会[2006]3号《企业会计准则》</field> @@ -15,10 +9,7 @@ <field name="currency_id" ref="base.CNY" /> <field name="cash_account_code_prefix">1001</field> <field name="bank_account_code_prefix">1002</field> - <field name="transfer_account_id" ref="account_1003" /> - </record> - <record id="account_1003" model="account.account.template"> - <field name="chart_template_id" ref="l10n_chart_china_standard_business" /> + <field name="transfer_account_code_prefix">1003</field> </record> </data> </odoo> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> <!-- Chart Template --> - <record id="co_puc_1115" model="account.account.template"> - <field name="name">Remesas En Tránsito</field> - <field name="code">1115</field> - <field name="user_type_id" ref="account.data_account_type_current_assets" /> - <field name="reconcile" eval="True" /> - </record> <record id="l10n_co_chart_template_generic" model="account.chart.template"> <field name="name">Colombian - Generic Chart of Accounts</field> <field name="currency_id" ref="base.COP"/> <field name="bank_account_code_prefix">1110</field> <field name="cash_account_code_prefix">1105</field> - <field name="transfer_account_id" ref="co_puc_1115"/> - </record> - - <record id="co_puc_1115" model="account.account.template"> - <field name="chart_template_id" ref="l10n_co_chart_template_generic"/> + <field name="transfer_account_code_prefix">1115</field> </record> </odoo> 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 @@ <odoo> <!-- Account Chart Template --> - <record id="account_account_template_0_111402" model="account.account.template"> - <field name="code">0-1114</field> - <field name="name">0-Fondos en tránsito</field> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - <field name="reconcile" eval="True"/> - </record> - <record id="account_chart_template_0" model="account.chart.template"> <field name="name">Costa Rica - Company 0</field> <field name="bank_account_code_prefix">0-1112</field> <field name="cash_account_code_prefix">0-1111</field> + <field name="transfer_account_code_prefix">0-1114</field> <field name="currency_id" ref="base.CRC"/> - <field name="transfer_account_id" ref="account_account_template_0_111402"/> - </record> - - <record id="account_account_template_0_111402" model="account.account.template"> - <field name="chart_template_id" ref="account_chart_template_0"/> </record> </odoo> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> <data noupdate="1"> - - <record id="account_1327" model="account.account.template"> - <field name="name">Finanzwechsel</field> - <field name="code">1327</field> - <field name="reconcile" eval="True"/> - <field name="tag_ids" eval="[(6,0, [ref('l10n_de.tag_de_asset_bs_B_III_2'),])]"/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> - <record id="l10n_de_chart_template" model="account.chart.template"> <field name="name">Deutscher Kontenplan SKR03</field> <field name="cash_account_code_prefix">1000</field> <field name="bank_account_code_prefix">1200</field> + <field name="transfer_account_code_prefix">1327</field> <field name="currency_id" ref="base.EUR"/> - <field name="transfer_account_id" ref="account_1327"/> - </record> - - <record id="account_1327" model="account.account.template"> - <field name="chart_template_id" ref="l10n_de_chart_template"/> </record> <record model="account.account.template" id="account_0010"> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> <data noupdate="1"> - - <record id="account_1520" model="account.account.template"> - <field name="name">Finanzwechsel</field> - <field name="code">1520</field> - <field name="reconcile" eval="True"/> - <field name="tag_ids" eval="[(6,0, [ref('l10n_de.tag_de_asset_bs_B_III_2'),])]"/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> - <record id="l10n_chart_de_skr04" model="account.chart.template"> <field name="name">Deutscher Kontenplan SKR04</field> <field name="cash_account_code_prefix">1600</field> <field name="bank_account_code_prefix">1800</field> + <field name="transfer_account_code_prefix">1520</field> <field name="currency_id" ref="base.EUR"/> - <field name="transfer_account_id" ref="account_1520"/> - </record> - - <record id="account_1520" model="account.account.template"> - <field name="chart_template_id" ref="l10n_chart_de_skr04"/> </record> <record model="account.account.template" id="account_0100"> 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 @@ <data noupdate="1"> <!-- Chart of Accounts Template --> - <record id="cash_transfer_account" model="account.account.template"> - <field name="name">Transferencias de Efectivo</field> - <field name="code">11010100</field> - <field eval="True" name="reconcile"/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> <record id="do_chart_template" model="account.chart.template"> <field name="name">Catálogo de Cuentas Dominicano (NIIF)</field> <field name="code_digits">8</field> <field name="cash_account_code_prefix">110101</field> <field name="bank_account_code_prefix">110102</field> - <field name="transfer_account_id" ref="cash_transfer_account"/> + <field name="transfer_account_code_prefix">11010100</field> <field name="currency_id" ref="base.DOP"/> </record> - <record id="cash_transfer_account" model="account.account.template"> - <field name="chart_template_id" ref="do_chart_template"/> - </record> </data> </odoo> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> - <record model="account.account.template" id="transfer_account_id"> - <field name="name">Cuenta de transferencia</field> - <field name="code">10.01.03</field> - <field name="user_type_id" ref="account.data_account_type_current_assets" /> - <field name="reconcile" eval="True" /> - </record> - <record id="ec_chart_template" model="account.chart.template"> <field name="name">Ecuador - Chart of Accounts</field> <field name="currency_id" ref="base.ECS"/> - <field name="transfer_account_id" ref="transfer_account_id"/> <field name="bank_account_code_prefix">10.01.02</field> <field name="cash_account_code_prefix">10.01.01</field> + <field name="transfer_account_code_prefix">10.01.03</field> <field name="code_digits" eval="6"/> - </record> - - <record model="account.account.template" id="transfer_account_id"> - <field name="chart_template_id" ref="ec_chart_template"/> </record> <!-- Account Templates --> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> <data> - - <!--Declared here in two parts instead of account_account_template_common_data.xml - to allow creating the common CoA without causing a mistake due to a missing - value for field transfer_account_id.--> - <record id="account_common_572999" model="account.account.template"> - <field name="name">Cuenta de transferencia inter-bancos</field> - <field name="code">572999</field> - <field name="user_type_id" ref="account.data_account_type_current_assets" /> - <field name="reconcile" eval="True" /> - <field name="group_id" ref="l10n_es.account_group_572" /> - </record> - <record id="account_chart_template_common" model="account.chart.template"> <field name="name">PGCE común</field> <field name="visible" eval="0"/> <field name="currency_id" ref="base.EUR"/> <field name="cash_account_code_prefix">570</field> <field name="bank_account_code_prefix">572</field> - <field name="transfer_account_id" ref="account_common_572999"/> + <field name="transfer_account_code_prefix">572999</field> </record> - <record id="account_common_572999" model="account.account.template"> - <field name="chart_template_id" ref="account_chart_template_common"/> - </record> - <record id="account_chart_template_pymes" model="account.chart.template"> <field name="name">PGCE PYMEs 2008</field> <field name="complete_tax_set" eval="True"/> <field name="currency_id" ref="base.EUR"/> <field name="cash_account_code_prefix">570</field> <field name="bank_account_code_prefix">572</field> - <field name="transfer_account_id" ref="account_common_572999"/> + <field name="transfer_account_code_prefix">572999</field> <field name="parent_id" ref="account_chart_template_common"/> </record> @@ -42,7 +26,7 @@ <field name="currency_id" ref="base.EUR"/> <field name="cash_account_code_prefix">570</field> <field name="bank_account_code_prefix">572</field> - <field name="transfer_account_id" ref="account_common_572999"/> + <field name="transfer_account_code_prefix">572999</field> <field name="parent_id" ref="account_chart_template_common"/> </record> @@ -52,7 +36,7 @@ <field name="currency_id" ref="base.EUR"/> <field name="cash_account_code_prefix">570</field> <field name="bank_account_code_prefix">572</field> - <field name="transfer_account_id" ref="account_common_572999"/> + <field name="transfer_account_code_prefix">572999</field> <field name="parent_id" ref="account_chart_template_common"/> </record> </data> 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 @@ <odoo> <menuitem id="account_reports_et_statements_menu" name="Ethiopia" parent="account.menu_finance_reports" sequence="0" groups="account.group_account_user"/> - <record model="account.account.template" id="transfer_account_id"> - <field name="name">Transfer account</field> - <field name="code">212</field> - <field name="user_type_id" ref="account.data_account_type_current_assets" /> - <field name="reconcile" eval="True" /> - </record> - <record id="l10n_et" model="account.chart.template"> <field name="name">Ethiopia Tax and Account Chart Template</field> <field name="code_digits">6</field> <field name="currency_id" ref="base.ETB"/> <field name="bank_account_code_prefix">211</field> <field name="cash_account_code_prefix">211</field> - <field name="transfer_account_id" ref="transfer_account_id"/> - </record> - - <record model="account.account.template" id="transfer_account_id"> - <field name="chart_template_id" ref="l10n_et"/> + <field name="transfer_account_code_prefix">212</field> </record> </odoo> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> - <record id="pcg_58" model="account.account.template"> - <field name="name">Virements Internes</field> - <field name="code">58</field> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - <field name="reconcile" eval="True"/> - </record> - <!-- Chart template --> <record id="l10n_fr_pcg_chart_template" model="account.chart.template"> <field name="name">Plan Comptable Général (France)</field> @@ -14,11 +7,7 @@ <field name="code_digits" eval="6"/> <field name="bank_account_code_prefix">512</field> <field name="cash_account_code_prefix">53</field> - <field name="transfer_account_id" ref="pcg_58"/> + <field name="transfer_account_code_prefix">58</field> <field name="complete_tax_set" eval="True" /> </record> - - <record id="pcg_58" model="account.account.template"> - <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> - </record> </odoo> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> <data noupdate="1"> - - <record id="transfer_account_id" model="account.account.template"> - <field name="code">1017</field> - <field name="name">Liquidity Transfers</field> - <field name="reconcile" eval='True'/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> - <record id="configurable_chart_template" model="account.chart.template"> <field name="name">Configurable Account Chart Template</field> <field name="code_digits">6</field> <field name="bank_account_code_prefix">1014</field> <field name="cash_account_code_prefix">1015</field> - <field name="transfer_account_id" ref="transfer_account_id"/> + <field name="transfer_account_code_prefix">1017</field> <field name="currency_id" ref="base.USD"/> </record> - <record id="transfer_account_id" model="account.account.template"> - <field name="chart_template_id" ref="configurable_chart_template"/> - </record> <!-- Account Templates--> 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 @@ <menuitem id="account_reports_gr_statements_menu" name="Greece" parent="account.menu_finance_reports" sequence="0" groups="account.group_account_user"/> - <record id="chartgr_38_07" model="account.account.template"> - <field name="code">38.07</field> - <field name="name">Η μεταφορά λογαριασμού</field> - <field name="reconcile" eval='True'/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> <record id="l10n_gr_chart_template" model="account.chart.template"> <field name="name">Πρότυπο Ελληνικού Λογιστικού Σχεδίου</field> <field name="bank_account_code_prefix">38</field> <field name="cash_account_code_prefix">38</field> + <field name="transfer_account_code_prefix">38.07</field> <field name="code_digits">6</field> <field name="currency_id" ref="base.EUR"/> - <field name="transfer_account_id" ref="chartgr_38_07"/> - </record> - <record id="chartgr_38_07" model="account.account.template"> - <field name="chart_template_id" ref="l10n_gr_chart_template"/> </record> <record id="chartgr_10_00" model="account.account.template"> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> <data noupdate="1"> - <record id="transfer_account_id" model="account.account.template"> - <field name="code">1.0.03.01</field> - <field name="name">Cuenta de Transferencia</field> - <field name="reconcile" eval='True'/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> - <record id="cuentas_plantilla" model="account.chart.template"> <field name="name">Plantilla de cuentas de Guatemala (sencilla)</field> <field name="bank_account_code_prefix">1.0.01.0</field> <field name="cash_account_code_prefix">1.0.02.0</field> + <field name="transfer_account_code_prefix">1.0.03.01</field> <field name="code_digits">9</field> <field name="currency_id" ref="base.QTQ"/> - <field name="transfer_account_id" ref="transfer_account_id"/> </record> - <record id="transfer_account_id" model="account.account.template"> - <field name="chart_template_id" ref="cuentas_plantilla"/> - </record> - <!-- Plantilla --> <!-- Cuentas de Balance General --> 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 @@ <field name="active" eval="True" /> </record> - <record id="l10n_hk_transfer" model="account.account.template"> - <field name="name">Transfer Account</field> - <field name="code">111220</field> - <field name="reconcile" eval="True" /> - <field name="user_type_id" ref="account.data_account_type_current_assets" /> - </record> - <!-- Account Chart template --> <record id="l10n_hk_chart_template" model="account.chart.template"> <field name="name">Hong Kong - Chart of Accounts</field> <field name="bank_account_code_prefix">1200</field> <field name="cash_account_code_prefix">1210</field> + <field name="transfer_account_code_prefix">111220</field> <field name="code_digits">6</field> - <field name="transfer_account_id" ref="l10n_hk_transfer" /> <field name="currency_id" ref="base.HKD" /> </record> - <record id="l10n_hk_transfer" model="account.account.template"> - <field name="chart_template_id" ref="l10n_hk_chart_template" /> - </record> </odoo> 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 @@ <!-- Account Chart Template --> <record id="l10n_hk_chart_template" model="account.chart.template"> <field name="name">Hong Kong - Chart of Accounts</field> - <field name="transfer_account_id" ref="l10n_hk_transfer" /> <field name="property_account_receivable_id" ref="l10n_hk_1240" /> <field name="property_account_payable_id" ref="l10n_hk_2211" /> <field name="property_account_income_categ_id" ref="l10n_hk_41" /> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> <data noupdate="1"> - <record id="transfer_account_id" model="account.account.template"> - <field name="code">1.1.01.00</field> - <field name="name">Cuenta de Transferencia</field> - <field name="reconcile" eval='True'/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> <record id="cuentas_plantilla" model="account.chart.template"> <field name="name">Plantilla de cuentas de Honduras (sencilla)</field> <field name="bank_account_code_prefix">1.1.01.</field> <field name="cash_account_code_prefix">1.1.01.</field> + <field name="transfer_account_code_prefix">1.1.01.00</field> <field name="code_digits">9</field> <field name="currency_id" ref="base.HNL"/> - <field name="transfer_account_id" ref="transfer_account_id"/> - </record> - <record id="transfer_account_id" model="account.account.template"> - <field name="chart_template_id" ref="cuentas_plantilla"/> </record> <!-- Cuentas de Balance General --> 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 @@ <data noupdate="1"> <!-- Account Chart Template --> - <record id="transfer_account" model="account.account.template"> - <field name="code">1009</field> - <field name="name">Žiro-račun prijelazni konto</field> - <field name="reconcile" eval='True'/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> <record id="l10n_hr_chart_template_rrif" model="account.chart.template"> <field name="name">RRIF-ov računski plan za poduzetnike</field> <field name="bank_account_code_prefix">101</field> <field name="cash_account_code_prefix">102</field> + <field name="transfer_account_code_prefix">1009</field> <field name="currency_id" ref="base.HRK"/> <field name="code_digits">0</field> - <field name="transfer_account_id" ref="transfer_account"/> - </record> - <record id="transfer_account" model="account.account.template"> - <field name="chart_template_id" ref="l10n_hr_chart_template_rrif"/> </record> </data> 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 @@ <odoo> <menuitem id="account_reports_hu_statements_menu" name="Hungary" parent="account.menu_finance_reports" sequence="0" groups="account.group_account_user"/> - <record id="chart_hu_389" model="account.account.template"> - <field name="code">389</field> - <field name="name">Átvezetési számla</field> - <field name="reconcile" eval='True'/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> <record id="hungarian_chart_template" model="account.chart.template"> <field name="name">Magyar főkönyvi kivonat</field> <field name="code_digits">4</field> <field name="cash_account_code_prefix">381</field> <field name="bank_account_code_prefix">384</field> + <field name="transfer_account_code_prefix">389</field> <field name="currency_id" ref="base.HUF"/> - <field name="transfer_account_id" ref="chart_hu_389"/> - </record> - <record id="chart_hu_389" model="account.account.template"> - <field name="chart_template_id" ref="hungarian_chart_template"/> </record> </odoo>
\ 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 @@ <odoo> <menuitem id="account_reports_in_statements_menu" name="India" parent="account.menu_finance_reports" sequence="0" groups="account.group_account_user"/> - <record id="standard_transfer_account_id" model="account.account.template"> - <field name="code">1008</field> - <field name="name">Transfer Account</field> - <field name="reconcile" eval='True'/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> <record id="indian_chart_template_standard" model="account.chart.template"> <field name="name">Indian Chart of Accounts - Standard</field> <field name="bank_account_code_prefix">1002</field> <field name="cash_account_code_prefix">1001</field> + <field name="transfer_account_code_prefix">1008</field> <field name="code_digits">6</field> <field name="currency_id" ref="base.INR"/> - <field name="transfer_account_id" ref="standard_transfer_account_id"/> </record> - <record id="standard_transfer_account_id" model="account.account.template"> - <field name="chart_template_id" ref="indian_chart_template_standard"/> - </record> <record id="sgst_tag_account" model="account.account.tag"> <field name="name">SGST</field> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> <!-- India - Standard Accounting Chart --> - <record id="standard_transfer_account_id" model="account.account.template"> - <field name="code">1206</field> - <field name="name">Transfer Account</field> - <field name="reconcile" eval='True'/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> <record id="indian_chart_template_schedule6" model="account.chart.template"> <field name="name">Indian Chart of Accounts - Schedule VI</field> <field name="bank_account_code_prefix">12142</field> <field name="cash_account_code_prefix">12141</field> + <field name="transfer_account_code_prefix">1206</field> <field name="code_digits">6</field> <field name="currency_id" ref="base.INR"/> - <field name="transfer_account_id" ref="standard_transfer_account_id"/> - </record> - <record id="standard_transfer_account_id" model="account.account.template"> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> </record> <!-- Liabilities --> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> <!-- Chart Template --> - <record id="transfer_account" model="account.account.template"> - <field name="code">183</field> - <field name="name">conto di trasferimento</field> - <field name="reconcile" eval='True'/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> <record id="l10n_it_chart_template_generic" model="account.chart.template"> <field name="name">Italy - Generic Chart of Accounts</field> <field name="cash_account_code_prefix">180</field> <field name="bank_account_code_prefix">182</field> + <field name="transfer_account_code_prefix">183</field> <field name="currency_id" ref="base.EUR"/> - <field name="transfer_account_id" ref="transfer_account"/> </record> - <record id="transfer_account" model="account.account.template"> - <field name="chart_template_id" ref="l10n_it_chart_template_generic"/> - </record> <!-- Account Tags --> <record id="tax_tag_01" model="account.account.tag"> 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 @@ <menuitem id="account_reports_jp_statements_menu" name="Japan" parent="account.menu_finance_reports" sequence="0" groups="account.group_account_user"/> <!-- Chart Template --> - <record id="transfer_account_id" model="account.account.template"> - <field name="code">A11109</field> - <field name="name">振替口座</field> - <field name="reconcile" eval='True'/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> <record id="l10n_jp1" model="account.chart.template"> <field name="name">日本勘定設定テンプレート</field> <field name="code_digits">7</field> <field name="bank_account_code_prefix">A11102</field> <field name="cash_account_code_prefix">A11105</field> + <field name="transfer_account_code_prefix">A11109</field> <field name="currency_id" ref="base.JPY"/> - <field name="transfer_account_id" ref="transfer_account_id"/> - </record> - <record id="transfer_account_id" model="account.account.template"> - <field name="chart_template_id" ref="l10n_jp1"/> </record> <!-- Account Tags --> 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 @@ <odoo> <menuitem id="account_reports_lu_statements_menu" name="Luxembourg" parent="account.menu_finance_reports" sequence="0" groups="account.group_account_user"/> - <record id="lu_2011_account_517" model="account.account.template"> - <field name="code">517</field> - <field name="name">Internal transfers</field> - <field name="reconcile" eval='True'/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> <record id="lu_2011_chart_1" model="account.chart.template"> <field name="name">PCMN Luxembourg</field> <field name="bank_account_code_prefix">513</field> <field name="cash_account_code_prefix">516</field> + <field name="transfer_account_code_prefix">517</field> <field name="code_digits">6</field> <field name="currency_id" ref="base.EUR"/> - <field name="transfer_account_id" ref="lu_2011_account_517"/> <field name="spoken_languages" eval="'fr_FR;de_DE'"/> </record> - <record id="lu_2011_account_517" model="account.account.template"> - <field name="chart_template_id" ref="lu_2011_chart_1"/> - </record> </odoo> 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 @@ --> <menuitem id="account_reports_ma_statements_menu" name="Morocco" parent="account.menu_finance_reports" sequence="0" groups="account.group_account_user"/> - <record id="pcg_5115" model="account.account.template"> - <field name="name">Virement de fonds</field> - <field name="code">5115</field> - <field name="reconcile" eval='True'/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> <record id="l10n_kzc_temp_chart" model="account.chart.template"> <field name="name">Plan comptable marocain</field> <field name="code_digits">6</field> <field name="currency_id" ref="base.MAD"/> <field name="bank_account_code_prefix">5141</field> <field name="cash_account_code_prefix">5161</field> - <field name="transfer_account_id" ref="pcg_5115"/> - </record> - <record id="pcg_5115" model="account.account.template"> - <field name="chart_template_id" ref="l10n_kzc_temp_chart"/> + <field name="transfer_account_code_prefix">5115</field> </record> <record id="pcg_1111" model="account.account.template"> 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 @@ <!-- CoA Base --> - <record id='cuenta102_01' model='account.account.template'> - <field name='name'>Transferencias bancarias moneda nacional</field> - <field name='code'>102.01.01</field> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - <field name="reconcile" eval="True"/> - <field name="tag_ids" eval="[(6,0,[ref('account_tag_102_01')])]"/> - </record> <record id="mx_coa" model="account.chart.template"> <field name="name">Plan de Cuentas para Mexico</field> <field name="bank_account_code_prefix">102.01.0</field> <field name="cash_account_code_prefix">101.01.0</field> + <field name="transfer_account_code_prefix">102.01.01</field> <field name="code_digits">3</field> <field name="currency_id" ref="base.MXN"/> - <field name="transfer_account_id" ref="cuenta102_01"/> <field name="use_anglo_saxon" eval="True"/> </record> <!-- Accounts --> - <record id='cuenta102_01' model='account.account.template'> - <field name="chart_template_id" ref="mx_coa"/> - </record> <record id='cuenta102_02' model='account.account.template'> <field name='name'>Transferencias bancarias moneda extranjera</field> <field name='code'>102.02.01</field> 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 @@ <data noupdate="0"> <!-- Chart Template --> - <record id="transfer_account_id" model="account.account.template"> - <field name="name">Kruisposten</field> - <field name="code">1060</field> - <field name="reconcile" eval="True"/> - <field name="user_type_id" ref="account.data_account_type_liquidity"/> - <field name="tag_ids" eval="[(6,0,[ref('account_tag_25')])]"/> - </record> - <record id="l10nnl_chart_template" model="account.chart.template"> <field name="name">Nederlands Grootboekschema</field> <field name="cash_account_code_prefix">101</field> <field name="bank_account_code_prefix">103</field> + <field name="transfer_account_code_prefix">1060</field> <field name="code_digits">6</field> <field name="currency_id" ref="base.EUR"/> - <field name="transfer_account_id" ref="transfer_account_id"/> - </record> - - <record id="transfer_account_id" model="account.account.template"> - <field name="chart_template_id" ref="l10nnl_chart_template"/> </record> </data> 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 @@ <menuitem id="account_reports_no_statements_menu" name="Norwegian Statements" parent="account.menu_finance_reports" sequence="0" groups="account.group_account_user"/> - <record id="chart1940" model="account.account.template"> - <field name="code">1940</field> - <field name="reconcile" eval="True"/> - <field name="user_type_id" ref="account.data_account_type_current_assets" /> - <field name="name">Bank i transfer</field> - </record> - <!-- Account Templates --> <record id="no_chart_template" model="account.chart.template"> <field name="name">Norway's Chart of Accounts</field> <field name="cash_account_code_prefix">1900</field> <field name="bank_account_code_prefix">1920</field> + <field name="transfer_account_code_prefix">1940</field> <field name="code_digits">4</field> <field name="currency_id" ref="base.NOK"/> - <field name="transfer_account_id" ref="chart1940"/> - </record> - - <record id="chart1940" model="account.account.template"> - <field name="chart_template_id" ref="no_chart_template"/> </record> <!-- Account Templates --> 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 @@ <data noupdate="0"> - <record id="nz_11170" model="account.account.template"> - <field name="name">Transfers</field> - <field name="code">11170</field> - <field name="reconcile" eval="True"/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> - <record id="l10n_nz_chart_template" model="account.chart.template"> <field name="name">New Zealand Tax and Account Chart Template (by Willow IT)</field> <field name="bank_account_code_prefix">1111</field> <field name="cash_account_code_prefix">1113</field> + <field name="transfer_account_code_prefix">11170</field> <field name="code_digits">5</field> <field name="currency_id" ref="base.NZD"/> - <field name="transfer_account_id" ref="nz_11170"/> - </record> - - <record id="nz_11170" model="account.account.template"> - <field name="chart_template_id" ref="l10n_nz_chart_template"/> </record> </data> 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 @@ <field name="name">Cuentas No Clasificadas</field> </record> - <record id="transfer_account_id" model="account.account.template"> - <field name="name">Cuentas de Transferencia</field> - <field name="code">112.</field> - <field name="reconcile" eval="True"/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> - <!-- Account Chart Templates --> <record id="l10npa_chart_template" model="account.chart.template"> <field name="name">Panamá - Plan de Cuentas</field> <field name="bank_account_code_prefix">111.</field> <field name="cash_account_code_prefix">113.</field> + <field name="transfer_account_code_prefix">112.</field> <field name="code_digits">7</field> <field name="currency_id" ref="base.PAB"/> - <field name="transfer_account_id" ref="transfer_account_id"/> - </record> - - <record id="transfer_account_id" model="account.account.template"> - <field name="chart_template_id" ref="l10npa_chart_template"/> </record> <!-- Account Templates --> 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 @@ <record id="account_account_type_EGP_NA_110" model="account.account.type"><field name="name">Gastos por Tributos</field></record> <record id="account_account_type_EGP_NA_140" model="account.account.type"><field name="name">Valuación y Deterioro de Activos y Provisiones</field></record> - <record id="103000" model="account.account.template"> - <field name="name">Caja y bancos - Efectivo en tránsito </field> - <field name="code">103000</field> - <field name="reconcile" eval="True"/> - <field ref="account.data_account_type_current_assets" name="user_type_id"/> - </record> - <!--Account Chart Templaes--> <record id="pe_chart_template" model="account.chart.template"> <field name="name">Peru - Plan de Cuentas 2011</field> <field name="bank_account_code_prefix">104</field> <field name="cash_account_code_prefix">101</field> + <field name="transfer_account_code_prefix">103000</field> <field name="code_digits">6</field> <field name="currency_id" ref="base.PEN"/> - <field name="transfer_account_id" ref="103000"/> </record> <!-- Account Templates --> - <record id="103000" model="account.account.template"> - <field name="chart_template_id" ref="pe_chart_template"/> - </record> - <record id="102_001" model="account.account.template"><field name="name">Caja y ...- Fondos fijos / caja chica 01 PEN (S/.)</field><field name="code">102.001</field><field name="reconcile" eval="False"/><field ref="account.data_account_type_current_assets" name="user_type_id"/><field name="chart_template_id" ref="pe_chart_template"/></record> <record id="105100" model="account.account.template"><field name="name">Caja y ...- Certificados bancarios / certificados bancarios ** otros equivalentes de efectivos </field><field name="code">105100</field><field name="reconcile" eval="False"/><field ref="account.data_account_type_current_assets" name="user_type_id"/><field name="chart_template_id" ref="pe_chart_template"/></record> <record id="105200" model="account.account.template"><field name="name">Caja y ...- Certificados bancarios / otros</field><field name="code">105200</field><field name="reconcile" eval="False"/><field ref="account.data_account_type_current_assets" name="user_type_id"/><field name="chart_template_id" ref="pe_chart_template"/></record> 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 @@ <record model="account.account.type" id="account_type_nonbalance"> <field name="name">Pozabilansowe</field> </record> - - <record id="chart11090000" model="account.account.template"> - <field name="code">11-090-000</field> - <field name="reconcile" eval="True"/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - <field name="name">Środki pieniężne w drodze</field> - </record> <!-- Chart template --> <record id="pl_chart_template" model="account.chart.template"> @@ -29,13 +22,10 @@ <field name="currency_id" ref="base.PLN"/> <field name="bank_account_code_prefix">11-000-000</field> <field name="cash_account_code_prefix">12-000-000</field> - <field name="transfer_account_id" ref="chart11090000"/> + <field name="transfer_account_code_prefix">11-090-000</field> </record> <!-- Account Templates --> - <record id="chart11090000" model="account.account.template"> - <field name="chart_template_id" ref="pl_chart_template"/> - </record> <record id="chart01010000" model="account.account.template"> <field name="code">01-010-000</field> 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 @@ <odoo> <data noupdate="1"> - <record id="chart_15" model="account.account.template"> - <field name="name">Contas de transferência</field> - <field name="code">15</field> - <field name="reconcile" eval="True"/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> - <record id="pt_chart_template" model="account.chart.template"> <field name="name">Portugal - Template do Plano de Contas SNC</field> <field name="cash_account_code_prefix">11</field> <field name="bank_account_code_prefix">12</field> + <field name="transfer_account_code_prefix">15</field> <field name="currency_id" ref="base.EUR"/> - <field name="transfer_account_id" ref="chart_15"/> - </record> - - <record id="chart_15" model="account.account.template"> - <field name="chart_template_id" ref="pt_chart_template"/> </record> <record id="chart_13" model="account.account.template"> 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 @@ <field name="name">CONTURI IN AFARA BILANTULUI</field> </record> - <record id="pcg_581" model="account.account.template"> - <field name="name">Viramente interne</field> - <field name="code">581</field> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - <field name="reconcile" eval="True"/> - </record> - <!-- Chart template --> <record id="ro_chart_template" model="account.chart.template"> <field name="name">Romania - Chart of Accounts</field> <field name="bank_account_code_prefix">512</field> <field name="cash_account_code_prefix">531</field> + <field name="transfer_account_code_prefix">581</field> <field name="code_digits">6</field> <field name="currency_id" ref="base.RON"/> - <field name="transfer_account_id" ref="pcg_581"/> </record> <!-- Account Templates --> - <record id="pcg_581" model="account.account.template"> - <field name="chart_template_id" ref="ro_chart_template"/> - </record> - <record id="pcg_1011" model="account.account.template"> <field name="name">Capital subscris nevărsat</field> <field name="code">1011</field> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> - <record id="transfer_account" model="account.account.template"> - <field name="name">Transfer Account</field> - <field name="code">18</field> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - <field name="reconcile" eval="True"/> - </record> - <record id="account_arabic_coa_general" model="account.chart.template"> <field name="name">Saudi Arabia - Chart of Accounts</field> <field name="bank_account_code_prefix">1</field> <field name="cash_account_code_prefix">1</field> + <field name="transfer_account_code_prefix">18</field> <field name="code_digits">6</field> <field name="currency_id" ref="base.SAR"/> - <field name="transfer_account_id" ref="transfer_account"/> <field name="spoken_languages" eval="'en_US;ar_EG;ar_SY'"/> </record> - - <record id="transfer_account" model="account.account.template"> - <field name="chart_template_id" ref="account_arabic_coa_general"/> - </record> </odoo> 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 @@ <odoo> <menuitem id="account_reports_sg_statements_menu" name="Singapore" parent="account.menu_finance_reports" sequence="0" groups="account.group_account_user"/> - <record id="transfer_account_id" model="account.account.template"> - <field name="name">Transfer Accounts</field> - <field name="code">101100</field> - <field name="reconcile" eval="True"/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> - <record id="sg_chart_template" model="account.chart.template"> <field name="name">Singapore Chart of Accounts - Standard</field> <field name="cash_account_code_prefix">10140</field> <field name="bank_account_code_prefix">10141</field> + <field name="transfer_account_code_prefix">101100</field> <field name="code_digits">6</field> <field name="currency_id" ref="base.SGD" /> - <field name="transfer_account_id" ref="transfer_account_id"/> - </record> - - <record id="transfer_account_id" model="account.account.template"> - <field name="chart_template_id" ref="sg_chart_template"/> </record> <record model="account.account.template" id="account_account_696"> 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 @@ <odoo> <menuitem id="account_reports_si_statements_menu" name="Slovenia" parent="account.menu_finance_reports" sequence="0" groups="account.group_account_user"/> <!-- Chart Template --> - <record id="gd_acc_109000" model="account.account.template"> - <field name="name">DENAR NA POTI</field> - <field name="code">109</field> - <field name="reconcile" eval="True"/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> <record id="gd_chart" model="account.chart.template"> <field name="name">Kontni načrt za gospodarske družbe</field> <field name="bank_account_code_prefix">110</field> <field name="cash_account_code_prefix">100</field> + <field name="transfer_account_code_prefix">109</field> <field name="code_digits">6</field> <field name="currency_id" ref="base.EUR"/> - <field name="transfer_account_id" ref="gd_acc_109000"/> - </record> - <record id="gd_acc_109000" model="account.account.template"> - <field name="chart_template_id" ref="gd_chart"/> </record> </odoo> 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 @@ <field name="name">Comptes spéciaux</field> </record> - - <record id="pcg_588" model="account.account.template"> - <field name="name">AUTRES VIREMENTS INTERNES</field> - <field name="code">588</field> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - <field name="reconcile" eval="True"/> - </record> <!-- Chart Template --> <record id="syscohada_chart_template" model="account.chart.template"> <field name="name">SYSCOHADA - Plan de compte</field> <field name="bank_account_code_prefix">52</field> <field name="cash_account_code_prefix">51</field> + <field name="transfer_account_code_prefix">588</field> <field name="code_digits">6</field> <field name="currency_id" ref="base.XOF"/> - <field name="transfer_account_id" ref="pcg_588"/> - </record> - <record id="pcg_588" model="account.account.template"> - <field name="chart_template_id" ref="syscohada_chart_template"/> </record> <!-- Account Account Template --> 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 @@ <!-- CHART OF Template --> -<record id="transfer_account" model="account.account.template"> - <field name="name">Transfer Account</field> - <field name="code">16</field> - <field name="reconcile" eval="True"/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> -</record> <record id="chart" model="account.chart.template"> <field name="name">Thailand - Chart of Accounts</field> <field name="cash_account_code_prefix">1100</field> <field name="bank_account_code_prefix">1110</field> + <field name="transfer_account_code_prefix">16</field> <field name="currency_id" ref="base.THB"/> - <field name="transfer_account_id" ref="transfer_account"/> -</record> -<record id="transfer_account" model="account.account.template"> - <field name="chart_template_id" ref="chart"/> </record> <!-- 1. ASSETS --> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> <!-- Chart template of l10n_tr --> - <record id="transfer_account_id" model="account.account.template"> - <field name="name">Verilen Çekler ve Ödeme Emirleri</field> - <field name="code">103</field> - <field name="reconcile" eval="True"/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> <record id="l10ntr_tek_duzen_hesap" model="account.chart.template"> <field name="name">Tek Düzen Hesap Planı</field> <field name="bank_account_code_prefix">102</field> <field name="cash_account_code_prefix">100</field> + <field name="transfer_account_code_prefix">103</field> <field name="code_digits">6</field> <field name="currency_id" ref="base.TRY"/> - <field name="transfer_account_id" ref="transfer_account_id"/> - </record> - <record id="transfer_account_id" model="account.account.template"> - <field name="chart_template_id" ref="l10ntr_tek_duzen_hesap"/> </record> <!-- Account template definition --> 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 @@ <odoo> <menuitem id="account_reports_uk_statements_menu" name="England" parent="account.menu_finance_reports" sequence="0" groups="account.group_account_user"/> - <record id="transfer_account" model="account.account.template"> - <field name="name">Transfer Account</field> - <field name="code">1220</field> - <field name="reconcile" eval="True"/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> - <!-- Chart template --> <record id="l10n_uk" model="account.chart.template"> <field name="name">UK Tax and Account Chart Template (by SmartMode)</field> <field name="bank_account_code_prefix">1200</field> <field name="cash_account_code_prefix">1210</field> + <field name="transfer_account_code_prefix">1220</field> <field name="code_digits">6</field> <field name="currency_id" ref="base.GBP"/> - <field name="transfer_account_id" ref="transfer_account"/> - </record> - - <record id="transfer_account" model="account.account.template"> - <field name="chart_template_id" ref="l10n_uk"/> </record> </odoo> 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 @@ <menuitem id="account_reports_uy_statements_menu" name="Uruguay" parent="account.menu_finance_reports" sequence="0" groups="account.group_account_user"/> <data noupdate="1"> - <record id="uy_code_11120" model="account.account.template"> - <field name="code">11120</field> - <field name="reconcile" eval="True"/> - <field name="name">Movimientos Banco (def)</field> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> - <record id="uy_chart_template" model="account.chart.template"> <field name="name">Plan de Cuentas Uruguay - Template</field> <field name="code_digits">6</field> <field name="bank_account_code_prefix">1111</field> <field name="cash_account_code_prefix">1112</field> + <field name="transfer_account_code_prefix">11120</field> <field name="currency_id" ref="base.UYU"/> - <field name="transfer_account_id" ref="uy_code_11120"/> </record> - <record id="uy_code_11120" model="account.account.template"> - <field name="chart_template_id" ref="uy_chart_template"/> - </record> - - <record id="uy_code_11201" model="account.account.template"> <field name="code">11201</field> <field name="reconcile" eval="True"/> 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 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> <data noupdate="1"> - <record model="account.account.template" id="account_activa_account_1129003"> - <field name="code">1129003</field> - <field name="name">TRANSFERENCIAS BANCARIAS</field> - <field name="reconcile" eval="True"/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> - <record id="ve_chart_template_amd" model="account.chart.template"> <field name="name">Venezuelan - Account</field> <field name="bank_account_code_prefix">1113</field> <field name="cash_account_code_prefix">1111</field> + <field name="transfer_account_code_prefix">1129003</field> <field name="code_digits">7</field> <field name="currency_id" ref="base.VEF"/> - <field name="transfer_account_id" ref="account_activa_account_1129003"/> </record> <!-- Chart of account --> - <record model="account.account.template" id="account_activa_account_1129003"> - <field name="chart_template_id" ref="ve_chart_template_amd"/> - </record> <record model="account.account.template" id="account_activa_account_1115001"> <field name="code">1115001</field> <field name="name">PAPELES COMERCIALES</field> 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 @@ <menuitem id="account_reports_vn_statements_menu" name="Vietnam" parent="account.menu_finance_reports" sequence="0" groups="account.group_account_user"/> <data> - <record id="transfer_account_id" model="account.account.template"> - <field name="name">Tiền đang chuyển</field> - <field name="code">113</field> - <field name="reconcile" eval="True"/> - <field name="user_type_id" ref="account.data_account_type_current_assets"/> - </record> - <!-- Account Chart Templates --> <record id="vn_template" model="account.chart.template"> <field name="name">VN - Chart of Accounts</field> @@ -17,11 +10,7 @@ <field name="currency_id" ref="base.VND"/> <field name="bank_account_code_prefix">112</field> <field name="cash_account_code_prefix">111</field> - <field name="transfer_account_id" ref="transfer_account_id"/> - </record> - - <record id="transfer_account_id" model="account.account.template"> - <field name="chart_template_id" ref="vn_template"/> + <field name="transfer_account_code_prefix">113</field> </record> <!-- Account Templates --> |
