diff --git a/addons/account/account.py b/addons/account/account.py index 1981228eacb..6e96ce73962 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2973,7 +2973,6 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True), 'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Cash and Banks', required=True), 'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"), - 'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."), "sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"), "purchase_tax": fields.many2one("account.tax.template", "Default Purchase Tax"), 'sale_tax_rate': fields.float('Sales Tax(%)'), @@ -3010,8 +3009,6 @@ class wizard_multi_charts_accounts(osv.osv_memory): res.update({'bank_accounts_id': [{'acc_name': _('Cash'), 'account_type': 'cash'},{'acc_name': _('Bank'), 'account_type': 'bank'}]}) if 'company_id' in fields: res.update({'company_id': self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0].company_id.id}) - if 'seq_journal' in fields: - res.update({'seq_journal': True}) ids = self.pool.get('account.chart.template').search(cr, uid, [('visible', '=', True)], context=context) if ids: diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 066471d60a5..7bcb6864d41 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2376,7 +2376,6 @@ - diff --git a/addons/account/res_config.py b/addons/account/res_config.py index 583b769d315..bd7d1b3e711 100644 --- a/addons/account/res_config.py +++ b/addons/account/res_config.py @@ -49,7 +49,6 @@ class account_config_settings(osv.osv_memory): 'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'), 'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', domain="[('visible','=', True)]"), 'code_digits': fields.integer('# of Digits', help="No. of Digits to use for account code"), - 'seq_journal': fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."), 'sale_tax': fields.many2one("account.tax.template", "Default Sale Tax"), 'purchase_tax': fields.many2one("account.tax.template", "Default Purchase Tax"), 'sale_tax_rate': fields.float('Sales Tax (%)'), @@ -128,7 +127,6 @@ class account_config_settings(osv.osv_memory): _defaults = { 'company_id': _default_company, 'has_default_company': _default_has_default_company, - 'seq_journal': True, 'date_start': lambda *a: time.strftime('%Y-01-01'), 'date_stop': lambda *a: time.strftime('%Y-12-31'), 'period': 'month', @@ -237,7 +235,6 @@ class account_config_settings(osv.osv_memory): 'company_id': config.company_id.id, 'chart_template_id': config.chart_template_id.id, 'code_digits': config.code_digits or 6, - 'seq_journal': config.seq_journal, 'sale_tax': config.sale_tax.id, 'purchase_tax': config.purchase_tax.id, 'sale_tax_rate': config.sale_tax_rate, diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml index 24c7887bdfe..fe49208a757 100644 --- a/addons/account/res_config_view.xml +++ b/addons/account/res_config_view.xml @@ -34,7 +34,6 @@ name="%(open_account_charts_modules)d" type="action"/> -