diff --git a/account.py b/account.py index 81e97173d0..07e5345ee0 100644 --- a/account.py +++ b/account.py @@ -511,11 +511,11 @@ class Account(ModelSQL, ModelView): ] self._error_messages.update({ 'recursive_accounts': 'You can not create recursive accounts!', - 'delete_account_with_move_line': 'You can not delete account ' \ - 'with move line!', + 'delete_account_containing_move_lines': 'You can not delete ' \ + 'accounts containing move lines!', }) self._sql_error_messages.update({ - 'parent_fkey': 'You can not delete account ' \ + 'parent_fkey': 'You can not delete accounts ' \ 'that have children!', }) self._order.insert(0, ('code', 'ASC')) @@ -829,8 +829,8 @@ class Account(ModelSQL, ModelView): if move_line_obj.search(cursor, user, [ ('account', 'in', account_ids), ], context=context): - self.raise_user_error(cursor, 'delete_account_with_move_line', - context=context) + self.raise_user_error(cursor, + 'delete_account_containing_move_lines', context=context) return super(Account, self).delete(cursor, user, account_ids, context=context) @@ -983,7 +983,7 @@ class OpenChartAccountInit(ModelView): _description = __doc__ fiscalyear = fields.Many2One('account.fiscalyear', 'Fiscal Year', help='Leave empty for all open fiscal year') - posted = fields.Boolean('Posted Move', help='Only posted move') + posted = fields.Boolean('Posted Move', help='Show only posted move') def default_posted(self, cursor, user, context=None): return False @@ -1048,7 +1048,7 @@ class PrintGeneralLegderInit(ModelView): domain="[('fiscalyear', '=', fiscalyear), " \ "('start_date', '>=', (start_period, 'start_date'))]") company = fields.Many2One('company.company', 'Company', required=True) - posted = fields.Boolean('Posted Move', help='Only posted move') + posted = fields.Boolean('Posted Move', help='Show only posted move') empty_account = fields.Boolean('Empty Account', help='With account without move') @@ -1264,7 +1264,7 @@ class PrintTrialBalanceInit(ModelView): "('start_date', '>=', (start_period, 'start_date'))]", depends=['start_period']) company = fields.Many2One('company.company', 'Company', required=True) - posted = fields.Boolean('Posted Move', help='Only posted move') + posted = fields.Boolean('Posted Move', help='Show only posted move') empty_account = fields.Boolean('Empty Account', help='With account without move') @@ -1419,7 +1419,7 @@ class OpenBalanceSheetInit(ModelView): _description = __doc__ date = fields.Date('Date', required=True) company = fields.Many2One('company.company', 'Company', required=True) - posted = fields.Boolean('Posted Move', help='Only posted move') + posted = fields.Boolean('Posted Move', help='Show only posted move') def default_date(self, cursor, user, context=None): date_obj = self.pool.get('ir.date') @@ -1518,7 +1518,7 @@ class OpenIncomeStatementInit(ModelView): "('start_date', '>=', (start_period, 'start_date'))]", depends=['start_period']) company = fields.Many2One('company.company', 'Company', required=True) - posted = fields.Boolean('Posted Move', help='Only posted move') + posted = fields.Boolean('Posted Move', help='Show only posted move') def default_fiscalyear(self, cursor, user, context=None): fiscalyear_obj = self.pool.get('account.fiscalyear') @@ -1908,7 +1908,7 @@ class OpenThirdPartyBalanceInit(ModelView): company = fields.Many2One('company.company', 'Company', required=True) fiscalyear = fields.Many2One('account.fiscalyear', 'Fiscal Year', required=True) - posted = fields.Boolean('Posted Move', help='Only posted move') + posted = fields.Boolean('Posted Move', help='Show only posted move') def default_fiscalyear(self, cursor, user, context=None): @@ -2037,7 +2037,7 @@ class OpenAgedBalanceInit(ModelView): term3 = fields.Integer("Third Term", required=True) unit = fields.Selection( [('day', 'Day'), ('month', 'Month')], "Unit", required=True) - posted = fields.Boolean('Posted Move', help='Only posted move') + posted = fields.Boolean('Posted Move', help='Show only posted move') def default_fiscalyear(self, cursor, user, context=None): fiscalyear_obj = self.pool.get('account.fiscalyear') diff --git a/fiscalyear.py b/fiscalyear.py index b935acc97f..9bcfa66851 100644 --- a/fiscalyear.py +++ b/fiscalyear.py @@ -61,8 +61,8 @@ class FiscalYear(ModelSQL, ModelView): 'The balance of the account "%s" must be zero!', 'close_error': 'You can not close a fiscal year until ' \ 'there is older fiscal year opened!', - 'reopen_error': 'You can not re-open a fiscal year until ' \ - 'there is youngest fiscal year closed!', + 'reopen_error': 'You can not reopen a fiscal year until ' \ + 'there is more recent fiscal year closed!', }) def default_state(self, cursor, user, context=None): diff --git a/move.py b/move.py index a942154512..1bfb6b7250 100644 --- a/move.py +++ b/move.py @@ -55,18 +55,18 @@ class Move(ModelSQL, ModelView): self._order.insert(0, ('date', 'DESC')) self._order.insert(1, ('reference', 'DESC')) self._error_messages.update({ - 'del_posted_move': 'You can not delete posted move!', + 'del_posted_move': 'You can not delete posted moves!', 'post_empty_move': 'You can not post an empty move!', - 'post_unbalanced_move': 'You can not post a unbalanced move!', + 'post_unbalanced_move': 'You can not post an unbalanced move!', 'modify_posted_move': 'You can not modify a posted move ' \ 'in this journal!', 'period_centralized_journal': 'You can not create more than ' \ 'one move per period\n' \ - 'in centralized journal!', - 'company_in_move': 'You can not create lines on account\n' \ - 'from different company in the same move!', + 'in a centralized journal!', + 'company_in_move': 'You can not create lines on accounts\n' \ + 'of different companies in the same move!', 'date_outside_period': 'You can not create move ' \ - 'with date outside the period!', + 'with a date outside the period!', }) def init(self, cursor, module_name): @@ -486,8 +486,8 @@ class Line(ModelSQL, ModelView): self._error_messages.update({ 'add_modify_closed_journal_period': 'You can not ' \ 'add/modify lines in a closed journal period!', - 'modify_posted_move': 'You can not modify line from a posted move!', - 'modify_reconciled': 'You can not modify reconciled line!', + 'modify_posted_move': 'You can not modify lines of a posted move!', + 'modify_reconciled': 'You can not modify reconciled lines!', 'no_journal': 'No journal defined!', 'move_view_inactive_account': 'You can not create move lines\n' \ 'on view/inactive accounts!', @@ -1689,7 +1689,7 @@ class PrintGeneralJournalInit(ModelView): from_date = fields.Date('From Date', required=True) to_date = fields.Date('To Date', required=True) company = fields.Many2One('company.company', 'Company', required=True) - posted = fields.Boolean('Posted Move', help='Only posted move') + posted = fields.Boolean('Posted Move', help='Show only posted move') def default_from_date(self, cursor, user, context=None): date_obj = self.pool.get('ir.date') diff --git a/period.py b/period.py index 096f58c3f1..1c46379efe 100644 --- a/period.py +++ b/period.py @@ -52,10 +52,10 @@ class Period(ModelSQL, ModelView): 'a period from a closed fiscal year!', 'change_post_move_sequence': 'You can not change ' \ 'the post move sequence ' \ - 'if there is already posted move in the period', + 'if there is already posted moves in the period', 'close_period_non_posted_move': 'You can not close ' \ 'a period with non posted moves!', - 'periods_overlaps': 'You can not have 2 periods that overlaps!', + 'periods_overlaps': 'You can not have two overlapping periods!', 'check_move_sequence': 'You must have different ' \ 'post move sequences per fiscal year ' \ 'and in the same company!', diff --git a/tax.py b/tax.py index 852b962cb0..89af343ec0 100644 --- a/tax.py +++ b/tax.py @@ -966,8 +966,8 @@ class Account(ModelSQL, ModelView): taxes = fields.Many2Many('account.account-account.tax', 'account', 'tax', 'Default Taxes', domain="[('company', '=', company), ('parent', '=', False)]", - help='Default tax for manual encoding move lines \n' \ - 'for journal type: "expense" and "revenue"', + help='Default tax for manual encoding of move lines \n' \ + 'for journal types: "expense" and "revenue"', depends=['company']) Account()