From 7a07db384d794385239e742e390ec5f6920f03d7 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 15 Nov 2010 19:46:17 +0100 Subject: [PATCH] [FIX] account: fixed incorrect calls to _(..) function bzr revid: odo@openerp.com-20101115184617-725dv33unrhw0hqm --- addons/account/account.py | 8 ++++---- addons/account/wizard/account_move_journal.py | 4 ++-- addons/account/wizard/account_use_model.py | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index eb5b227979b..0f8c9575931 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1389,7 +1389,7 @@ class account_move(osv.osv): if line.account_id.currency_id and line.currency_id: if line.account_id.currency_id.id != line.currency_id.id and (line.account_id.currency_id.id != line.account_id.company_id.currency_id.id): - raise osv.except_osv(_('Error'), _("""Couldn't create move with currency different from the secondary currency of the account "%s - %s". Clear the secondary currency field of the account definition if you want to accept all currencies.""" % (line.account_id.code, line.account_id.name))) + raise osv.except_osv(_('Error'), _("""Couldn't create move with currency different from the secondary currency of the account "%s - %s". Clear the secondary currency field of the account definition if you want to accept all currencies.""") % (line.account_id.code, line.account_id.name)) if abs(amount) < 10 ** -4: # If the move is balanced @@ -2082,8 +2082,8 @@ class account_model(osv.osv): date_maturity = time.strftime('%Y-%m-%d') if line.date_maturity == 'partner': if not line.partner_id: - raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term! \ - \nPlease define partner on it!"%(line.name, model.name))) + raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!" \ + "\nPlease define partner on it!")%(line.name, model.name)) if line.partner_id.property_payment_term: payment_term_id = line.partner_id.property_payment_term.id pterm_list = pt_obj.compute(cr, uid, payment_term_id, value=1, date_ref=date_maturity) @@ -2973,4 +2973,4 @@ class account_bank_accounts_wizard(osv.osv_memory): account_bank_accounts_wizard() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py index eb3d78dd584..72ae65f83b9 100644 --- a/addons/account/wizard/account_move_journal.py +++ b/addons/account/wizard/account_move_journal.py @@ -51,7 +51,7 @@ class account_move_journal(osv.osv_memory): if context.get('journal_type', False): jids = journal_pool.search(cr, uid, [('type','=', context.get('journal_type'))]) if not jids: - raise osv.except_osv(_('Configuration Error !'), _('Can\'t find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Financial Accounting\Accounts\Journals.' % (context.get('journal_type')))) + raise osv.except_osv(_('Configuration Error !'), _('Can\'t find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration/Financial Accounting/Accounts/Journals.') % context.get('journal_type')) journal_id = jids[0] return journal_id @@ -175,4 +175,4 @@ class account_move_journal(osv.osv_memory): account_move_journal() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/account_use_model.py b/addons/account/wizard/account_use_model.py index baf09f5ac16..51bd3a96083 100644 --- a/addons/account/wizard/account_use_model.py +++ b/addons/account/wizard/account_use_model.py @@ -41,8 +41,8 @@ class account_use_model(osv.osv_memory): for line in model.lines_id: if line.date_maturity == 'partner': if not line.partner_id: - raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' is based on partner payment term! \ - \nPlease define partner on it!"%(line.name))) + raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' is based on partner payment term!"\ + "\nPlease define partner on it!")%line.name) pass def create_entries(self, cr, uid, ids, context=None): @@ -124,4 +124,4 @@ class account_use_model(osv.osv_memory): account_use_model() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: