odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] Merged SSU's branch of warning messages improvements 

bzr revid: pso@tinyerp.com-20120801063734-4p0ywsoc0ekx07w0
This commit is contained in:
pso (OpenERP) 2012-08-01 12:07:34 +05:30
parent bc68e4079c 41d1135812
commit 1f46c4ea0b
23 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account_analytic_plans/account_analytic_plans.py
View File

@ -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 this name and code already exists !'))
res = acct_anal_plan_line_obj.search(cr, uid, [('plan_id','=',journal.plan_id.id)], context=context)
for i in res:

2
addons/account_analytic_plans/i18n/account_analytic_plans.pot
View File

@ -183,7 +183,7 @@ msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:221
#, python-format
msgid "A model having same name and code."
msgid "A model having this name and code already exists !"
msgstr ""
#. module: account_analytic_plans

2
addons/document/document.py
View File

@ -61,7 +61,7 @@ class document_file(osv.osv):
return False
if ids is not None:
raise NotImplementedError("Ids is just there by convention,please donot use it yet.")
raise NotImplementedError("Ids is just there by convention,please do not use it.")
cr.execute("UPDATE ir_attachment " \
"SET parent_id = %s, db_datas = decode(encode(db_datas,'escape'), 'base64') " \

2
addons/event/event.py
View File

@ -365,7 +365,7 @@ class event_registration(osv.osv):
self.write(cr, uid, ids, values)
self.message_append(cr, uid, ids, _('State set to Done'), body_text=_('Done'))
else:
raise osv.except_osv(_('Error!'),_("You must wait the event starting day to do this action.") )
raise osv.except_osv(_('Error!'),_("You must wait for the starting day of the event to do this action.") )
return True
def button_reg_cancel(self, cr, uid, ids, context=None, *args):

2
addons/google_base_account/i18n/google_base_account.pot
View File

@ -106,7 +106,7 @@ msgstr ""
#. module: google_base_account
#: code:addons/google_base_account/wizard/google_login.py:75
#, python-format
msgid "Authentication fail check the user and password !"
msgid "Authentication failed. Check the user and password !"
msgstr ""
#. module: google_base_account

2
addons/google_base_account/wizard/google_login.py
View File

@ -74,7 +74,7 @@ class google_login(osv.osv_memory):
}
self.pool.get('res.users').write(cr, uid, uid, res, context=context)
else:
raise osv.except_osv(_('Error'), _("Authentication fail check the user and password !"))
raise osv.except_osv(_('Error'), _("Authentication failed. Check the user and password !"))
return self._get_next_action(cr, uid, context=context)

2
addons/hr_attendance/hr_attendance.py
View File

@ -137,7 +137,7 @@ class hr_employee(osv.osv):
warning_sign = "Sign Out"
for emp in self.read(cr, uid, ids, ['id'], context=context):
if not self._action_check(cr, uid, emp['id'], dt, context):
raise osv.except_osv(_('Warning !'), _('You try to %s with a date before to another event !\nTry to contact the administrator to correct attendances.')%(warning_sign,))
raise osv.except_osv(_('Warning !'), _('You tried to %s with a date anterior to another event !\nTry to contact the administrator to correct attendances.')%(warning_sign,))
res = {'action': type, 'employee_id': emp['id']}
if dt:

2
addons/hr_contract/hr_contract.py
View File

@ -97,7 +97,7 @@ class hr_contract(osv.osv):
return True
_constraints = [
(_check_dates, 'Error! Contract start-date must be lower then contract end-date.', ['date_start', 'date_end'])
(_check_dates, 'Error! Contract start-date must be less than contract end-date.', ['date_start', 'date_end'])
]
hr_contract()

2
addons/hr_contract/i18n/hr_contract.pot
View File

@ -234,7 +234,7 @@ msgstr ""
#. module: hr_contract
#: constraint:hr.contract:0
msgid "Error! Contract start-date must be lower then contract end-date."
msgid "Error! Contract start-date must be less than contract end-date."
msgstr ""
#. module: hr_contract

2
addons/hr_evaluation/hr_evaluation.py
View File

@ -240,7 +240,7 @@ class hr_evaluation(osv.osv):
self.write(cr, uid, ids, {'state':'progress'}, context=context)
for id in self.browse(cr, uid, ids, context=context):
if len(id.survey_request_ids) != len(request_obj.search(cr, uid, [('evaluation_id', '=', id.id),('state', 'in', ['done','cancel'])], context=context)):
raise osv.except_osv(_('Warning !'),_("You cannot change state, because some appraisal in waiting answer or draft state."))
raise osv.except_osv(_('Warning !'),_("You cannot change state, because some appraisal(s) are in waiting answer or draft state."))
return True
def button_done(self,cr, uid, ids, context=None):

2
addons/hr_evaluation/i18n/hr_evaluation.pot
View File

@ -812,7 +812,7 @@ msgstr ""
#: code:addons/hr_evaluation/hr_evaluation.py:244
#, python-format
msgid ""
"You cannot change state, because some appraisal in waiting answer or draft."
"You cannot change state, because some appraisal(s) are in waiting answer or draft state."
"state"
msgstr ""

2
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
View File

@ -315,7 +315,7 @@ class hr_timesheet_sheet(osv.osv):
def check_sign(self, cr, uid, ids, typ, context=None):
sheet = self.browse(cr, uid, ids, context=context)[0]
if not sheet.date_current == time.strftime('%Y-%m-%d'):
raise osv.except_osv(_('Error !'), _('You cannot sign in/sign out from an other date than today.'))
raise osv.except_osv(_('Error !'), _('You cannot sign in/sign out from other date than today.'))
return True
def sign(self, cr, uid, ids, typ, context=None):

2
addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
View File

@ -971,7 +971,7 @@ msgstr ""
#. module: hr_timesheet_sheet
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
#, python-format
msgid "You cannot sign in/sign out from an other date than today."
msgid "You cannot sign in/sign out from other date than today."
msgstr ""
#. module: hr_timesheet_sheet

4
addons/import_google/i18n/import_google.pot
View File

@ -33,8 +33,8 @@ msgstr ""
#. module: import_google
#: code:addons/import_google/wizard/import_google_data.py:71
#, python-format
msgid "No Google username or password is defined for user.\n"
"Please define in user view."
msgid "No Google Username or password is defined for user.\n"
"Please define on user's form."
msgstr ""
#. module: import_google

2
addons/import_google/wizard/import_google_data.py
View File

@ -73,7 +73,7 @@ class synchronize_google(osv.osv_memory):
user_obj = self.pool.get('res.users').browse(cr, uid, uid,context=context)
google=self.pool.get('google.login')
if not user_obj.gmail_user or not user_obj.gmail_password:
raise osv.except_osv(_('Warning !'), _("No Google username or password is defined for user.\nPlease define in user view."))
raise osv.except_osv(_('Warning !'), _("No Google Username or password is defined for user.\nPlease define on user's form."))
gd_client = google.google_login(user_obj.gmail_user,user_obj.gmail_password,type='group')
if not gd_client:
return [('failed', 'Connection to google fail')]

2
addons/mrp_operations/i18n/mrp_operations.pot
View File

@ -164,7 +164,7 @@ msgstr ""
#. module: mrp_operations
#: code:addons/mrp_operations/mrp_operations.py:486
#, python-format
msgid "There is no Operation to be cancelled!"
msgid "No operation to cancel."
msgstr ""
#. module: mrp_operations

2
addons/mrp_operations/mrp_operations.py
View File

@ -533,7 +533,7 @@ class mrp_operations_operation(osv.osv):
return False
if code.start_stop=='cancel':
if not 'start' in code_lst :
raise osv.except_osv(_('Error!'),_('There is no Operation to be cancelled!'))
raise osv.except_osv(_('Error!'),_('No operation to cancel.'))
return False
if 'done' in code_lst:
raise osv.except_osv(_('Error!'),_('Operation is already finished!'))

2
addons/purchase/i18n/purchase.pot
View File

@ -443,7 +443,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:499
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
#. module: purchase

2
addons/purchase/purchase.py
View File

@ -503,7 +503,7 @@ class purchase_order(osv.osv):
if inv and inv.state not in ('cancel','draft'):
raise osv.except_osv(
_('Unable to cancel this purchase order.'),
_('First cancel all receptions related to this purchase order.'))
_('You must first cancel all receptions related to this purchase order.'))
if inv:
wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
self.write(cr,uid,ids,{'state':'cancel'})

4
addons/sale/i18n/sale.pot
View File

@ -131,7 +131,7 @@ msgstr ""
#: code:addons/sale/sale.py:295
#, python-format
msgid ""
"In order to delete a confirmed sales order, you must cancel it before ! To "
"In order to delete a confirmed sales order, you must cancel it! To "
"cancel a sale order, you must first cancel related picking for delivery "
"orders."
msgstr ""
@ -1492,7 +1492,7 @@ msgstr ""
#. module: sale
#: code:addons/sale/sale.py:604
#, python-format
msgid "First cancel all picking attached to this sales order."
msgid "You must first cancel all delivery order(s) attached to this sales order."
msgstr ""
#. module: sale

6
addons/sale/sale.py
View File

@ -295,7 +295,7 @@ class sale_order(osv.osv):
if s['state'] in ['draft', 'cancel']:
unlink_ids.append(s['id'])
else:
raise osv.except_osv(_('Invalid action !'), _('In order to delete a confirmed sales order, you must cancel it before ! To cancel a sale order, you must first cancel related picking for delivery orders.'))
raise osv.except_osv(_('Invalid action !'), _('In order to delete a confirmed sales order, you must cancel it! To cancel a sale order, you must first cancel related picking for delivery orders.'))
return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
@ -703,7 +703,7 @@ class sale_order(osv.osv):
if pick.state not in ('draft', 'cancel'):
raise osv.except_osv(
_('Cannot cancel sales order!'),
_('First cancel all picking attached to this sales order.'))
_('You must first cancel all delivery order(s) attached to this sales order.'))
if pick.state == 'cancel':
for mov in pick.move_lines:
proc_ids = proc_obj.search(cr, uid, [('move_id', '=', mov.id)])
@ -1210,7 +1210,7 @@ class sale_order_line(osv.osv):
account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, account_id)
if not account_id:
raise osv.except_osv(_('Error !'),
_('Please define Fiscal Position or income category account for Product Categories default Properties.'))
_('There is no Fiscal Position defined or Income category account defined for default properties of Product categories.'))
return {
'name': line.name,
'origin': line.order_id.name,

2
addons/stock/i18n/stock.pot
View File

@ -2842,7 +2842,7 @@ msgstr ""
#: code:addons/stock/stock.py:2379 code:addons/stock/stock.py:2440
#: code:addons/stock/wizard/stock_partial_picking.py:141
#, python-format
msgid "Please provide proper quantity."
msgid "Please provide proper Quantity."
msgstr ""
#. module: stock

2
addons/stock/wizard/stock_partial_picking.py
View File

@ -167,7 +167,7 @@ class stock_partial_picking(osv.osv_memory):
#Quantiny must be Positive
if wizard_line.quantity < 0:
raise osv.except_osv(_('Warning!'), _('Please provide proper quantity.'))
raise osv.except_osv(_('Warning!'), _('Please provide proper Quantity.'))
#Compute the quantity for respective wizard_line in the line uom (this jsut do the rounding if necessary)
qty_in_line_uom = uom_obj._compute_qty(cr, uid, line_uom.id, wizard_line.quantity, line_uom.id)