diff --git a/addons/account/models/account.py b/addons/account/models/account.py index 7fe329f41ce..f3a1228b58d 100644 --- a/addons/account/models/account.py +++ b/addons/account/models/account.py @@ -107,7 +107,7 @@ class AccountAccount(models.Model): last_time_entries_checked = fields.Datetime(string='Latest Invoices & Payments Matching Date', readonly=True, copy=False, help='Last time the invoices & payments matching was performed on this account. It is set either if there\'s not at least '\ 'an unreconciled debit and an unreconciled credit Or if you click the "Done" button.') - reconcile = fields.Boolean(string='Reconciliation of Entries', default=False, + reconcile = fields.Boolean(string='Allow Reconciliation', default=False, help="Check this box if this account allows invoices & payments matching of journal items.") tax_ids = fields.Many2many('account.tax', 'account_account_tax_default_rel', 'account_id', 'tax_id', string='Default Taxes') diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py index 22fa9e8d1ee..12b4433bd70 100644 --- a/addons/account/models/chart_template.py +++ b/addons/account/models/chart_template.py @@ -713,6 +713,9 @@ class WizardMultiChartsAccounts(models.TransientModel): 'cash_account_code_prefix': self.cash_account_code_prefix, 'chart_template_id': self.chart_template_id.id}) + #set the coa currency to active + self.currency_id.write({'active': True}) + # When we install the CoA of first company, set the currency to price types and pricelists if company.id == 1: for reference in ['product.list_price', 'product.standard_price', 'product.list0', 'purchase.list0']: @@ -738,7 +741,7 @@ class WizardMultiChartsAccounts(models.TransientModel): # Create the current year earning account (outside of the CoA) self.env['account.account'].create({ - 'code': '0', + 'code': '9999', 'name': _('Undistributed Profits/Losses'), 'user_type_id': self.env.ref("account.data_unaffected_earnings").id, 'company_id': company.id,}) diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml index a8d0e24675a..d6ac5b78d5f 100644 --- a/addons/account/views/account_invoice_view.xml +++ b/addons/account/views/account_invoice_view.xml @@ -133,8 +133,8 @@ - - + + @@ -194,8 +194,8 @@ - - + + @@ -245,7 +245,7 @@ - + @@ -383,7 +383,7 @@