diff --git a/addons/account/account.py b/addons/account/account.py index d501f35cbc7..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") @@ -3031,6 +3029,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): return res def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): + if context is None:context = {} res = super(wizard_multi_charts_accounts, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False) cmp_select = [] acc_template_obj = self.pool.get('account.chart.template') diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index 8c2865ea9b9..e2d67e7fb55 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -6,42 +6,34 @@ form - -
+ Accounting Application Configuration
- - Configure Your Chart of Accounts - - - The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default. - - - Configure - - - 23 - - - - - - - - - - - - - - + + + + -
+ + + + +
- 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 dec5843f08c..8302ae96cf2 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -36,7 +36,7 @@ - + @@ -49,23 +49,25 @@ account.invoice.line form -
- - -
@@ -91,20 +93,22 @@ account.invoice.tax form -
- - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -141,7 +145,7 @@ form 2 -
+
- - - - - - -