summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaurang Suthar(OpenERP) <>2012-07-25 17:09:00 +0530
committerpso (OpenERP) <pso@tinyerp.com>2012-07-25 17:09:00 +0530
commitc59e7ab9d0fe03031bd2bd0178a43ccd5fc81ca7 (patch)
treef793ee1e3db5d2c9d14d4465babb38f569f8d9d9
parent4c4055a4e08788db6496be29279e194aae25e6ba (diff)
[IMP] Improved warning messages for account* modules
bzr revid: pso@tinyerp.com-20120725113900-sx79bzkhh9812hib
-rw-r--r--addons/account_analytic_plans/account_analytic_plans.py4
-rw-r--r--addons/account_analytic_plans/i18n/account_analytic_plans.pot14
-rw-r--r--addons/account_analytic_plans/wizard/account_crossovered_analytic.py2
-rw-r--r--addons/account_analytic_plans/wizard/analytic_plan_create_model.py4
-rw-r--r--addons/account_bank_statement_extensions/account_bank_statement.py2
-rw-r--r--addons/account_bank_statement_extensions/i18n/account_bank_statement_extensions.pot2
-rw-r--r--addons/account_payment/account_move_line.py2
-rw-r--r--addons/account_payment/account_payment.py4
-rw-r--r--addons/account_payment/i18n/account_payment.pot2
-rw-r--r--addons/account_voucher/account_voucher.py6
-rw-r--r--addons/account_voucher/i18n/account_voucher.pot6
-rw-r--r--addons/anonymization/anonymization.py4
12 files changed, 26 insertions, 26 deletions
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index c0f7e062b21..f701b737d7b 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -218,7 +218,7 @@ class account_analytic_plan_instance(osv.osv):
pids = ana_plan_instance_obj.search(cr, uid, [('name','=',vals['name']), ('code','=',vals['code']), ('plan_id','<>',False)], context=context)
if pids:
- raise osv.except_osv(_('Error'), _('A model having same name and code.'))
+ raise osv.except_osv(_('Error!'), _('A model having same name and code.'))
res = acct_anal_plan_line_obj.search(cr, uid, [('plan_id','=',journal.plan_id.id)], context=context)
for i in res:
@@ -231,7 +231,7 @@ class account_analytic_plan_instance(osv.osv):
if acct_anal_acct.search(cr, uid, [('parent_id', 'child_of', [item.root_analytic_id.id]), ('id', '=', tempo[2]['analytic_account_id'])], context=context):
total_per_plan += tempo[2]['rate']
if total_per_plan < item.min_required or total_per_plan > item.max_required:
- raise osv.except_osv(_('Value Error'),_('The total should be between %s and %s.') % (str(item.min_required), str(item.max_required)))
+ raise osv.except_osv(_('Value Error!'),_('The total should be between %s and %s.') % (str(item.min_required), str(item.max_required)))
return super(account_analytic_plan_instance, self).create(cr, uid, vals, context=context)
diff --git a/addons/account_analytic_plans/i18n/account_analytic_plans.pot b/addons/account_analytic_plans/i18n/account_analytic_plans.pot
index 440d6907117..b36f4db2087 100644
--- a/addons/account_analytic_plans/i18n/account_analytic_plans.pot
+++ b/addons/account_analytic_plans/i18n/account_analytic_plans.pot
@@ -64,7 +64,7 @@ msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
#, python-format
-msgid "User Error"
+msgid "User Error!"
msgstr ""
#. module: account_analytic_plans
@@ -189,7 +189,7 @@ msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
#, python-format
-msgid "No analytic plan defined."
+msgid "Please define analytic plan."
msgstr ""
#. module: account_analytic_plans
@@ -341,7 +341,7 @@ msgstr ""
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
#, python-format
-msgid "Error"
+msgid "Error!"
msgstr ""
#. module: account_analytic_plans
@@ -351,7 +351,7 @@ msgstr ""
#. module: account_analytic_plans
#: constraint:account.move.line:0
-msgid "You can not create journal items on an account of type view."
+msgid "You cannot create journal items on an account of type view."
msgstr ""
#. module: account_analytic_plans
@@ -394,7 +394,7 @@ msgstr ""
#. module: account_analytic_plans
#: constraint:account.analytic.line:0
-msgid "You can not create analytic line on view account."
+msgid "You cannot create analytic line on view account."
msgstr ""
#. module: account_analytic_plans
@@ -502,7 +502,7 @@ msgstr ""
#. module: account_analytic_plans
#: constraint:account.move.line:0
-msgid "You can not create journal items on closed account."
+msgid "You cannot create journal items on closed account."
msgstr ""
#. module: account_analytic_plans
@@ -523,6 +523,6 @@ msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:234
#, python-format
-msgid "Value Error"
+msgid "Value Error!"
msgstr ""
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
index e8e7ef90668..0a53b8482cc 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
@@ -58,7 +58,7 @@ class account_crossovered_analytic(osv.osv_memory):
flag = False
break
if flag:
- raise osv.except_osv(_('User Error'),_('There are no Analytic lines related to Account %s.' % name))
+ raise osv.except_osv(_('User Error!'),_('There are no Analytic lines related to Account %s.' % name))
datas = {
'ids': [],
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
index 2f3aa088ee3..5a6eedb6bda 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
@@ -35,10 +35,10 @@ class analytic_plan_create_model(osv.osv_memory):
if 'active_id' in context and context['active_id']:
plan = plan_obj.browse(cr, uid, context['active_id'], context=context)
if (not plan.name) or (not plan.code):
- raise osv.except_osv(_('Error'), _('Please put a name and a code before saving the model.'))
+ raise osv.except_osv(_('Error!'), _('Please put a name and a code before saving the model.'))
pids = anlytic_plan_obj.search(cr, uid, [], context=context)
if not pids:
- raise osv.except_osv(_('Error'), _('No analytic plan defined.'))
+ raise osv.except_osv(_('Error!'), _('Please define analytic plan.'))
plan_obj.write(cr, uid, [context['active_id']], {'plan_id':pids[0]}, context=context)
model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'),('name', '=', 'view_analytic_plan_create_model')], context=context)
diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py
index c336c143d64..1addbd63019 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement.py
+++ b/addons/account_bank_statement_extensions/account_bank_statement.py
@@ -127,7 +127,7 @@ class account_bank_statement_line(osv.osv):
if context is None:
context = {}
if context.get('block_statement_line_delete', False):
- raise osv.except_osv(_('Warning'), _('Delete operation not allowed ! \
+ raise osv.except_osv(_('Warning!'), _('Delete operation not allowed ! \
Please go to the associated bank statement in order to delete and/or modify bank statement line.'))
return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context)
diff --git a/addons/account_bank_statement_extensions/i18n/account_bank_statement_extensions.pot b/addons/account_bank_statement_extensions/i18n/account_bank_statement_extensions.pot
index ece0af13a1d..bd4cfa14261 100644
--- a/addons/account_bank_statement_extensions/i18n/account_bank_statement_extensions.pot
+++ b/addons/account_bank_statement_extensions/i18n/account_bank_statement_extensions.pot
@@ -155,7 +155,7 @@ msgstr ""
#. module: account_bank_statement_extensions
#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
#, python-format
-msgid "Warning"
+msgid "Warning!"
msgstr ""
#. module: account_bank_statement_extensions
diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index 5e7a9930b52..0c3e3ba30b5 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -107,7 +107,7 @@ class account_move_line(osv.osv):
if line.id not in line2bank and line.partner_id.bank_ids:
line2bank[line.id] = line.partner_id.bank_ids[0].id
else:
- raise osv.except_osv(_('Error !'), _('No partner defined on entry line.'))
+ raise osv.except_osv(_('Error !'), _('No partner is defined on entry line.'))
return line2bank
_columns = {
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 22b7fc5f6f2..1d4c46df029 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -71,8 +71,8 @@ class payment_order(osv.osv):
#dead code
def get_wizard(self, type):
logger = netsvc.Logger()
- logger.notifyChannel("warning", netsvc.LOG_WARNING,
- "No wizard found for the payment type '%s'." % type)
+ logger.notifyChannel("Warning!", netsvc.LOG_WARNING,
+ "No wizard is found for the payment type '%s'." % type)
return None
def _total(self, cursor, user, ids, name, args, context=None):
diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot
index c6554465f04..fd8672885c3 100644
--- a/addons/account_payment/i18n/account_payment.pot
+++ b/addons/account_payment/i18n/account_payment.pot
@@ -402,7 +402,7 @@ msgstr ""
#. module: account_payment
#: code:addons/account_payment/account_move_line.py:110
#, python-format
-msgid "No partner defined on entry line."
+msgid "No partner is defined on entry line."
msgstr ""
#. module: account_payment
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index c3af52f7dd0..36e2064060b 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -952,11 +952,11 @@ class account_voucher(osv.osv):
if amount_residual > 0:
account_id = line.voucher_id.company_id.expense_currency_exchange_account_id
if not account_id:
- raise osv.except_osv(_('Warning'),_("First configure the 'Income Currency Rate' on the company,after that create accounting entry for currency rate difference."))
+ raise osv.except_osv(_('Warning!'),_("First configure the 'Income Currency Rate' on the company,after that create accounting entry for currency rate difference."))
else:
account_id = line.voucher_id.company_id.income_currency_exchange_account_id
if not account_id:
- raise osv.except_osv(_('Warning'),_("First configure the 'Expense Currency Rate' on the company,after that create accounting entry for currency rate difference."))
+ raise osv.except_osv(_('Warning!'),_("First configure the 'Expense Currency Rate' on the company,after that create accounting entry for currency rate difference."))
# Even if the amount_currency is never filled, we need to pass the foreign currency because otherwise
# the receivable/payable account may have a secondary currency, which render this field mandatory
account_currency_id = company_currency <> current_currency and current_currency or False
@@ -1516,7 +1516,7 @@ class account_bank_statement_line(osv.osv):
return True
_constraints = [
- (_check_amount, 'The amount of the voucher must be the same amount as the one on the statement line', ['amount']),
+ (_check_amount, 'The amount of the voucher must be the same amount as the one on the statement line.', ['amount']),
]
_columns = {
diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot
index d3fc5a54831..f713571cb4b 100644
--- a/addons/account_voucher/i18n/account_voucher.pot
+++ b/addons/account_voucher/i18n/account_voucher.pot
@@ -299,7 +299,7 @@ msgstr ""
#: code:addons/account_voucher/account_voucher.py:927
#: code:addons/account_voucher/account_voucher.py:931
#, python-format
-msgid "Warning"
+msgid "Warning!"
msgstr ""
#. module: account_voucher
@@ -346,7 +346,7 @@ msgstr ""
#. module: account_voucher
#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+msgid "Error! You cannot create recursive companies."
msgstr ""
#. module: account_voucher
@@ -520,7 +520,7 @@ msgstr ""
#: constraint:account.bank.statement.line:0
msgid ""
"The amount of the voucher must be the same amount as the one on the "
-"statement line"
+"statement line."
msgstr ""
#. module: account_voucher
diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py
index 25e770394c8..47e168a12b8 100644
--- a/addons/anonymization/anonymization.py
+++ b/addons/anonymization/anonymization.py
@@ -453,9 +453,9 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
# add a result message in the wizard:
msgs = ["Anonymization successful.",
"",
- "Don't forget to save the resulting file to a safe place because you will not be able to revert the anonymization without this file.",
+ "Donot forget to save the resulting file to a safe place because you will not be able to revert the anonymization without this file.",
"",
- "This file is also stored in the %s directory. The absolute file path is: %s",
+ "This file is also stored in the %s directory. The absolute file path is: %s.",
]
msg = '\n'.join(msgs) % (dirpath, abs_filepath)