Pinakin Nayi (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-account-warning-pna
into lp:~openerp-dev/openobject-addons/trunk-exception-warning-imp-dbr.
Requested reviews:
Kuldeep Joshi(OpenERP) (kjo-openerp)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-account-warning-pna/+merge/114804
Hello ,
I improved the Exceptions, Constraint errors and Warning message of rest of
account module.
Thanks,
pna
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-account-warning-pna/+merge/114804
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-exception-warning-imp-dbr.
=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot 2012-06-21 05:08:52 +0000
+++ account/i18n/account.pot 2012-07-13 08:51:25 +0000
@@ -2538,7 +2538,7 @@
#: code:addons/account/account_invoice.py:688
#: code:addons/account/account_move_line.py:173
#, python-format
-msgid "You have to define an analytic journal on the '%s' journal!"
+msgid "You have to define an analytic journal on the '%s' journal."
msgstr ""
#. module: account
=== modified file 'account_analytic_plans/account_analytic_plans.py'
--- account_analytic_plans/account_analytic_plans.py 2012-06-05 17:54:11 +0000
+++ account_analytic_plans/account_analytic_plans.py 2012-07-13 08:51:25 +0000
@@ -218,7 +218,7 @@
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 this name and code already exists !'))
+ 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 @@
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)
@@ -338,7 +338,7 @@
for line in self.browse(cr, uid, ids, context=context):
if line.analytics_id:
if not line.journal_id.analytic_journal_id:
- raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (line.journal_id.name,))
+ raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal.") % (line.journal_id.name,))
toremove = analytic_line_obj.search(cr, uid, [('move_id','=',line.id)], context=context)
if toremove:
@@ -482,7 +482,7 @@
for st_line in st.line_ids:
if st_line.analytics_id:
if not st.journal_id.analytic_journal_id:
- raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (st.journal_id.name,))
+ raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal.") % (st.journal_id.name,))
if not st_line.amount:
continue
return True
=== modified file 'account_analytic_plans/i18n/account_analytic_plans.pot'
--- account_analytic_plans/i18n/account_analytic_plans.pot 2012-02-08 01:08:30 +0000
+++ account_analytic_plans/i18n/account_analytic_plans.pot 2012-07-13 08:51:25 +0000
@@ -183,13 +183,13 @@
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:221
#, python-format
-msgid "A model having this name and code already exists !"
+msgid "A model having same name and code."
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 "No analytic plan defined."
msgstr ""
#. module: account_analytic_plans
@@ -278,7 +278,7 @@
#: code:addons/account_analytic_plans/account_analytic_plans.py:341
#: code:addons/account_analytic_plans/account_analytic_plans.py:485
#, python-format
-msgid "You have to define an analytic journal on the '%s' journal!"
+msgid "You have to define an analytic journal on the '%s' journal."
msgstr ""
#. module: account_analytic_plans
@@ -362,7 +362,7 @@
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
#, python-format
-msgid "Please put a name and a code before saving the model !"
+msgid "Please put a name and a code before saving the model."
msgstr ""
#. module: account_analytic_plans
@@ -426,7 +426,7 @@
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:234
#, python-format
-msgid "The Total Should be Between %s and %s"
+msgid "The total should be between %s and %s."
msgstr ""
#. module: account_analytic_plans
=== modified file 'account_analytic_plans/wizard/account_crossovered_analytic.py'
--- account_analytic_plans/wizard/account_crossovered_analytic.py 2011-03-14 10:27:42 +0000
+++ account_analytic_plans/wizard/account_crossovered_analytic.py 2012-07-13 08:51:25 +0000
@@ -58,7 +58,7 @@
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': [],
=== modified file 'account_analytic_plans/wizard/analytic_plan_create_model.py'
--- account_analytic_plans/wizard/analytic_plan_create_model.py 2011-01-14 00:11:01 +0000
+++ account_analytic_plans/wizard/analytic_plan_create_model.py 2012-07-13 08:51:25 +0000
@@ -35,10 +35,10 @@
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'), _('No analytic plan defined.'))
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)
=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py 2012-05-04 11:57:48 +0000
+++ account_asset/account_asset.py 2012-07-13 08:51:25 +0000
@@ -270,7 +270,7 @@
return True
_constraints = [
- (_check_recursion, 'Error ! You can not create recursive assets.', ['parent_id']),
+ (_check_recursion, 'Error ! You cannot create recursive assets.', ['parent_id']),
(_check_prorata, 'Prorata temporis can be applied only for time method "number of depreciations".', ['prorata']),
]
=== modified file 'account_asset/i18n/account_asset.pot'
--- account_asset/i18n/account_asset.pot 2012-05-10 10:06:38 +0000
+++ account_asset/i18n/account_asset.pot 2012-07-13 08:51:25 +0000
@@ -323,7 +323,7 @@
#. module: account_asset
#: constraint:account.asset.asset:0
-msgid "Error ! You can not create recursive assets."
+msgid "Error ! You cannot create recursive assets."
msgstr ""
#. module: account_asset
=== modified file 'account_bank_statement_extensions/account_bank_statement.py'
--- account_bank_statement_extensions/account_bank_statement.py 2012-06-12 12:09:07 +0000
+++ account_bank_statement_extensions/account_bank_statement.py 2012-07-13 08:51:25 +0000
@@ -127,7 +127,7 @@
context = {}
if context.get('block_statement_line_delete', False):
raise osv.except_osv(_('Warning'), _('Delete operation not allowed ! \
- Please go to the associated bank statement in order to delete and/or modify this bank statement line'))
+ 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)
account_bank_statement_line()
=== modified file 'account_bank_statement_extensions/i18n/account_bank_statement_extensions.pot'
--- account_bank_statement_extensions/i18n/account_bank_statement_extensions.pot 2012-02-08 01:08:30 +0000
+++ account_bank_statement_extensions/i18n/account_bank_statement_extensions.pot 2012-07-13 08:51:25 +0000
@@ -112,7 +112,7 @@
#. module: account_bank_statement_extensions
#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
#, python-format
-msgid "Delete operation not allowed ! Please go to the associated bank statement in order to delete and/or modify this bank statement line"
+msgid "Delete operation not allowed ! Please go to the associated bank statement in order to delete and/or modify bank statement line."
msgstr ""
#. module: account_bank_statement_extensions
=== modified file 'account_payment/account_move_line.py'
--- account_payment/account_move_line.py 2011-07-01 23:41:24 +0000
+++ account_payment/account_move_line.py 2012-07-13 08:51:25 +0000
@@ -107,7 +107,7 @@
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 defined on entry line.'))
return line2bank
_columns = {
=== modified file 'account_payment/i18n/account_payment.pot'
--- account_payment/i18n/account_payment.pot 2012-02-08 01:08:30 +0000
+++ account_payment/i18n/account_payment.pot 2012-07-13 08:51:25 +0000
@@ -402,7 +402,7 @@
#. module: account_payment
#: code:addons/account_payment/account_move_line.py:110
#, python-format
-msgid "No partner defined on entry line"
+msgid "No partner defined on entry line."
msgstr ""
#. module: account_payment
=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py 2012-06-26 14:02:30 +0000
+++ account_voucher/account_voucher.py 2012-07-13 08:51:25 +0000
@@ -473,7 +473,7 @@
tr_type = 'purchase'
else:
if not journal.default_credit_account_id or not journal.default_debit_account_id:
- raise osv.except_osv(_('Error !'), _('Please define default credit/debit accounts on the journal "%s" !') % (journal.name))
+ raise osv.except_osv(_('Error !'), _('Please define default credit/debit accounts on the journal "%s".') % (journal.name))
account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
tr_type = 'receipt'
@@ -822,7 +822,7 @@
def unlink(self, cr, uid, ids, context=None):
for t in self.read(cr, uid, ids, ['state'], context=context):
if t['state'] not in ('draft', 'cancel'):
- raise osv.except_osv(_('Invalid action !'), _('Cannot delete Voucher(s) which are already opened or paid !'))
+ raise osv.except_osv(_('Invalid action !'), _('Cannot delete Voucher(s) which are already opened or paid.'))
return super(account_voucher, self).unlink(cr, uid, ids, context=context)
def onchange_payment(self, cr, uid, ids, pay_now, journal_id, partner_id, ttype='sale'):
@@ -920,7 +920,7 @@
name = seq_obj.next_by_id(cr, uid, voucher_brw.journal_id.sequence_id.id, context=context)
else:
raise osv.except_osv(_('Error !'),
- _('Please define a sequence on the journal !'))
+ _('Please define a sequence on the journal.'))
if not voucher_brw.reference:
ref = name.replace('/','')
else:
@@ -952,11 +952,11 @@
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'),_("Unable to create accounting entry for currency rate difference. You have to configure the field 'Income Currency Rate' on the company! "))
+ 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'),_("Unable to create accounting entry for currency rate difference. You have to configure the field 'Expense Currency Rate' on the company! "))
+ 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
=== modified file 'account_voucher/i18n/account_voucher.pot'
--- account_voucher/i18n/account_voucher.pot 2012-05-10 10:11:15 +0000
+++ account_voucher/i18n/account_voucher.pot 2012-07-13 08:51:25 +0000
@@ -81,7 +81,7 @@
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:797
#, python-format
-msgid "Cannot delete Voucher(s) which are already opened or paid !"
+msgid "Cannot delete Voucher(s) which are already opened or paid."
msgstr ""
#. module: account_voucher
@@ -620,8 +620,8 @@
#: code:addons/account_voucher/account_voucher.py:927
#, python-format
msgid ""
-"Unable to create accounting entry for currency rate difference. You have to "
-"configure the field 'Income Currency Rate' on the company! "
+"First configure the 'Income Currency Rate' on the company,after that create "
+"accounting entry for currency rate difference."
msgstr ""
#. module: account_voucher
@@ -751,7 +751,7 @@
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:462
#, python-format
-msgid "Please define default credit/debit accounts on the journal \"%s\" !"
+msgid "Please define default credit/debit accounts on the journal \"%s\"."
msgstr ""
#. module: account_voucher
@@ -762,7 +762,7 @@
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:895
#, python-format
-msgid "Please define a sequence on the journal !"
+msgid "Please define a sequence on the journal."
msgstr ""
#. module: account_voucher
@@ -1059,8 +1059,8 @@
#: code:addons/account_voucher/account_voucher.py:931
#, python-format
msgid ""
-"Unable to create accounting entry for currency rate difference. You have to "
-"configure the field 'Expense Currency Rate' on the company! "
+"First configure the 'Expense Currency Rate' on the company,after that create "
+"accounting entry for currency rate difference."
msgstr ""
#. module: account_voucher
=== modified file 'anonymization/anonymization.py'
--- anonymization/anonymization.py 2012-06-05 06:16:29 +0000
+++ anonymization/anonymization.py 2012-07-13 08:51:25 +0000
@@ -425,7 +425,7 @@
elif field_type == 'integer':
anonymized_value = 0
elif field_type in ['binary', 'many2many', 'many2one', 'one2many', 'reference']: # cannot anonymize these kind of fields
- msg = "Cannot anonymize fields of these types: binary, many2many, many2one, one2many, reference"
+ msg = "Cannot anonymize fields of these types: binary, many2many, many2one, one2many, reference."
self._raise_after_history_update(cr, uid, history_id, 'Error !', msg)
if anonymized_value is None:
@@ -515,7 +515,7 @@
wizards = self.browse(cr, uid, ids, context=context)
for wizard in wizards:
if not wizard.file_import:
- msg = "The anonymization export file was not supplied. It is not possible to reverse the anonymization process without this file."
+ msg = "It is not possible to reverse the anonymization process without supplying anonymization export file."
self._raise_after_history_update(cr, uid, history_id, 'Error !', msg)
# reverse the anonymization:
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
