diff options
17 files changed, 25 insertions, 24 deletions
diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py index 0223eb12020..3698655d73e 100644 --- a/addons/account/models/chart_template.py +++ b/addons/account/models/chart_template.py @@ -108,8 +108,8 @@ class AccountChartTemplate(models.Model): account_ids = fields.One2many('account.account.template', 'chart_template_id', string='Associated Account Templates') tax_template_ids = fields.One2many('account.tax.template', 'chart_template_id', string='Tax Template List', 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', oldname="bank_account_code_char") - cash_account_code_prefix = fields.Char(string='Prefix of the main cash accounts') + 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") @@ -685,8 +685,8 @@ class WizardMultiChartsAccounts(models.TransientModel): only_one_chart_template = fields.Boolean(string='Only One Chart Template Available') chart_template_id = fields.Many2one('account.chart.template', string='Chart Template', required=True) 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', oldname="bank_account_code_char") - cash_account_code_prefix = fields.Char('Cash Accounts Prefix') + 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) 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") diff --git a/addons/l10n_ae/data/l10n_ae_chart_data.xml b/addons/l10n_ae/data/l10n_ae_chart_data.xml index b87ff73142b..04640fb76ad 100644 --- a/addons/l10n_ae/data/l10n_ae_chart_data.xml +++ b/addons/l10n_ae/data/l10n_ae_chart_data.xml @@ -11,6 +11,7 @@ <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="currency_id" ref="base.AED" /> <field name="transfer_account_id" ref="transfer_account_id"/> <field name="complete_tax_set" eval="False"/> diff --git a/addons/l10n_be/data/account_chart_template_data.xml b/addons/l10n_be/data/account_chart_template_data.xml index bb37677b125..62579ed6918 100644 --- a/addons/l10n_be/data/account_chart_template_data.xml +++ b/addons/l10n_be/data/account_chart_template_data.xml @@ -9,6 +9,8 @@ <!-- 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="currency_id" ref="base.EUR"/> <field name="spoken_languages" eval="'nl_BE'"/> diff --git a/addons/l10n_be/data/account_pcmn_belgium_data.xml b/addons/l10n_be/data/account_pcmn_belgium_data.xml index b8730176185..1f62bb1d5a7 100644 --- a/addons/l10n_be/data/account_pcmn_belgium_data.xml +++ b/addons/l10n_be/data/account_pcmn_belgium_data.xml @@ -1152,8 +1152,6 @@ <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="code_digits">6</field> <field name="transfer_account_id" ref="trans"/> <field name="property_account_receivable_id" ref="a4000"/> diff --git a/addons/l10n_ca/data/account_chart_template_after_data.xml b/addons/l10n_ca/data/account_chart_template_after_data.xml index 6216f65899b..ecbccddd55a 100644 --- a/addons/l10n_ca/data/account_chart_template_after_data.xml +++ b/addons/l10n_ca/data/account_chart_template_after_data.xml @@ -2,8 +2,6 @@ <odoo> <!-- Chart template for en --> <record id="ca_en_chart_template_en" model="account.chart.template"> - <field name="cash_account_code_prefix">111</field> - <field name="bank_account_code_prefix">112</field> <field name="property_account_receivable_id" ref="chart1151_en"/> <field name="property_account_payable_id" ref="chart2111_en"/> <field name="property_account_income_categ_id" ref="chart411_en"/> diff --git a/addons/l10n_ca/data/account_chart_template_data.xml b/addons/l10n_ca/data/account_chart_template_data.xml index 29c1976b475..0694126466f 100644 --- a/addons/l10n_ca/data/account_chart_template_data.xml +++ b/addons/l10n_ca/data/account_chart_template_data.xml @@ -11,6 +11,8 @@ <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="currency_id" ref="base.CAD"/> <field name="use_anglo_saxon" eval="True"/> <field name="spoken_languages" eval="'fr_CA'"/> diff --git a/addons/l10n_cr/data/account_chart_template_data.xml b/addons/l10n_cr/data/account_chart_template_data.xml index 4592bb3767a..cedcf67d405 100644 --- a/addons/l10n_cr/data/account_chart_template_data.xml +++ b/addons/l10n_cr/data/account_chart_template_data.xml @@ -2,8 +2,6 @@ <odoo> <!-- Account Chart Template --> <record id="account_chart_template_0" model="account.chart.template"> - <field name="bank_account_code_prefix">0-1112</field> - <field name="cash_account_code_prefix">0-1111</field> <field name="property_account_receivable_id" ref="account_account_template_0_112001"/> <field name="property_account_payable_id" ref="account_account_template_0_211001"/> <field name="property_account_income_categ_id" ref="account_account_template_0_410001"/> diff --git a/addons/l10n_cr/data/l10n_cr_chart_data.xml b/addons/l10n_cr/data/l10n_cr_chart_data.xml index 2a265c89677..f71c0d6025a 100644 --- a/addons/l10n_cr/data/l10n_cr_chart_data.xml +++ b/addons/l10n_cr/data/l10n_cr_chart_data.xml @@ -11,6 +11,8 @@ <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="currency_id" ref="base.CRC"/> <field name="transfer_account_id" ref="account_account_template_0_111402"/> </record> 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 f98ce5839ce..4c65b4269f3 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 @@ -12,6 +12,8 @@ <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="currency_id" ref="base.EUR"/> <field name="transfer_account_id" ref="account_1327"/> </record> @@ -11294,8 +11296,6 @@ </record> <record id="l10n_de_chart_template" model="account.chart.template"> - <field name="cash_account_code_prefix">1000</field> - <field name="bank_account_code_prefix">1200</field> <field name="property_account_receivable_id" ref="account_1410"/> <field name="property_account_payable_id" ref="account_1610"/> <field name="property_account_expense_categ_id" ref="account_3400"/> 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 d3c7b19a7a9..b776158ef86 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 @@ -12,6 +12,8 @@ <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="currency_id" ref="base.EUR"/> <field name="transfer_account_id" ref="account_1520"/> </record> @@ -11361,8 +11363,6 @@ </record> <record id="l10n_chart_de_skr04" model="account.chart.template"> - <field name="cash_account_code_prefix">1600</field> - <field name="bank_account_code_prefix">1800</field> <field name="property_account_receivable_id" ref="account_1200"/> <field name="property_account_payable_id" ref="account_3300"/> <field name="property_account_expense_categ_id" ref="account_5400"/> diff --git a/addons/l10n_hr/data/account_chart_tag_data.xml b/addons/l10n_hr/data/account_chart_tag_data.xml index 417de15ba9b..02aac1ca6c9 100644 --- a/addons/l10n_hr/data/account_chart_tag_data.xml +++ b/addons/l10n_hr/data/account_chart_tag_data.xml @@ -2,8 +2,6 @@ <odoo> <!-- Account Chart Template --> <record id="l10n_hr_chart_template_rrif" model="account.chart.template"> - <field name="bank_account_code_prefix">101</field> - <field name="cash_account_code_prefix">102</field> <field name="property_account_receivable_id" ref="kp_rrif1200"/> <field name="property_account_payable_id" ref="kp_rrif2200"/> <field name="property_account_expense_categ_id" ref="kp_rrif4199"/> diff --git a/addons/l10n_hr/data/l10n_hr_chart_data.xml b/addons/l10n_hr/data/l10n_hr_chart_data.xml index 12710047315..3e78613d02b 100644 --- a/addons/l10n_hr/data/l10n_hr_chart_data.xml +++ b/addons/l10n_hr/data/l10n_hr_chart_data.xml @@ -13,6 +13,8 @@ </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="currency_id" ref="base.HRK"/> <field name="code_digits">0</field> <field name="transfer_account_id" ref="transfer_account"/> diff --git a/addons/l10n_nl/data/account.account.template.xml b/addons/l10n_nl/data/account.account.template.xml index 1c3b729874e..9f39b7bc512 100644 --- a/addons/l10n_nl/data/account.account.template.xml +++ b/addons/l10n_nl/data/account.account.template.xml @@ -2334,8 +2334,6 @@ <!-- Chart template --> <record id="l10nnl_chart_template" model="account.chart.template"> - <field name="cash_account_code_prefix">101</field> - <field name="bank_account_code_prefix">103</field> <field name="code_digits">6</field> <field name="property_account_receivable_id" ref="recv"/> <field name="property_account_payable_id" ref="pay"/> diff --git a/addons/l10n_nl/data/account_chart_template.xml b/addons/l10n_nl/data/account_chart_template.xml index 2af2071001b..36ec72853e2 100644 --- a/addons/l10n_nl/data/account_chart_template.xml +++ b/addons/l10n_nl/data/account_chart_template.xml @@ -13,6 +13,8 @@ <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="code_digits">6</field> <field name="currency_id" ref="base.EUR"/> <field name="transfer_account_id" ref="transfer_account_id"/> diff --git a/addons/l10n_syscohada/data/l10n_syscohada_chart_data.xml b/addons/l10n_syscohada/data/l10n_syscohada_chart_data.xml index 9daef3492e4..17267c5f5be 100644 --- a/addons/l10n_syscohada/data/l10n_syscohada_chart_data.xml +++ b/addons/l10n_syscohada/data/l10n_syscohada_chart_data.xml @@ -14,6 +14,8 @@ <!-- 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="code_digits">6</field> <field name="currency_id" ref="base.XOF"/> <field name="transfer_account_id" ref="pcg_588"/> @@ -6009,8 +6011,6 @@ </record> <record id="syscohada_chart_template" model="account.chart.template"> - <field name="bank_account_code_prefix">52</field> - <field name="cash_account_code_prefix">51</field> <field name="property_account_receivable_id" ref="pcg_4111"/> <field name="property_account_payable_id" ref="pcg_4011"/> <field name="property_account_expense_categ_id" ref="pcg_6011"/> diff --git a/addons/l10n_th/data/l10n_th_chart_data.xml b/addons/l10n_th/data/l10n_th_chart_data.xml index 906ae7104ab..94c094695f8 100644 --- a/addons/l10n_th/data/l10n_th_chart_data.xml +++ b/addons/l10n_th/data/l10n_th_chart_data.xml @@ -21,6 +21,8 @@ </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="currency_id" ref="base.THB"/> <field name="transfer_account_id" ref="transfer_account"/> </record> @@ -236,8 +238,6 @@ <field name="property_account_income_categ_id" ref="a_sales"/> <field name="income_currency_exchange_account_id" ref="a_income_gain"/> <field name="expense_currency_exchange_account_id" ref="a_exp_loss"/> - <field name="cash_account_code_prefix">1100</field> - <field name="bank_account_code_prefix">1110</field> </record> <!-- Account Tax Tags --> diff --git a/addons/l10n_ve/data/l10n_ve_chart_data.xml b/addons/l10n_ve/data/l10n_ve_chart_data.xml index ff025cc5dc3..80005380467 100644 --- a/addons/l10n_ve/data/l10n_ve_chart_data.xml +++ b/addons/l10n_ve/data/l10n_ve_chart_data.xml @@ -10,6 +10,8 @@ <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="code_digits">7</field> <field name="currency_id" ref="base.VEF"/> <field name="transfer_account_id" ref="account_activa_account_1129003"/> @@ -1877,8 +1879,6 @@ </record> <record id="ve_chart_template_amd" model="account.chart.template"> - <field name="bank_account_code_prefix">1113</field> - <field name="cash_account_code_prefix">1111</field> <field name="property_account_receivable_id" ref="account_activa_account_1122001"/> <field name="property_account_payable_id" ref="account_activa_account_2122001"/> <field name="property_account_expense_categ_id" ref="account_activa_account_7151001"/> |