diff --git a/addons/account/account.py b/addons/account/account.py
index f0c16d8586c..6e96ce73962 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2969,10 +2969,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
_columns = {
'company_id':fields.many2one('res.company', 'Company', required=True),
+ 'only_one_chart_template': fields.boolean('Only One Chart Template Available'),
'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(%)'),
@@ -3009,13 +3009,11 @@ 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:
if 'chart_template_id' in fields:
- res.update({'chart_template_id': ids[0]})
+ res.update({'only_one_chart_template': len(ids) == 1, 'chart_template_id': ids[0]})
if 'sale_tax' in fields:
sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
, "=", ids[0]), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index c12fe321edf..e2d67e7fb55 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -6,36 +6,34 @@
form
-
-
-
- Configure
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Configure Your Chart of Accounts
-
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
-
- Install your Chart of Accounts
+ Configure your Chart of Accounts
ir.actions.act_window
account.installer
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index bbc47f6a6e3..68a723aa4a0 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -56,8 +56,8 @@
-
-
+
@@ -218,10 +218,10 @@
-