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

[IMP]hr-warning-message 

bzr revid: pna@tinyerp.com-20120713121613-poze6x6838cr9xpe
This commit is contained in:
Pinakin Nayi (OpenERP) 2012-07-13 17:46:13 +05:30
parent bdcea123b7
commit 881148d4b1
17 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/hr/hr.py
View File

@ -66,7 +66,7 @@ class hr_employee_category(osv.osv):
return True
_constraints = [
(_check_recursion, 'Error ! You cannot create recursive Categories.', ['parent_id'])
(_check_recursion, 'Error! You cannot create recursive Categories.', ['parent_id'])
]
hr_employee_category()
@ -272,7 +272,7 @@ class hr_employee(osv.osv):
return True
_constraints = [
(_check_recursion, 'Error ! You cannot create recursive hierarchy of Employee(s).', ['parent_id']),
(_check_recursion, 'Error! You cannot create recursive hierarchy of Employee(s).', ['parent_id']),
]
hr_employee()

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

@ -305,7 +305,7 @@ msgstr ""
#. module: hr
#: constraint:hr.employee.category:0
msgid "Error ! You cannot create recursive Categories."
msgid "Error! You cannot create recursive Categories."
msgstr ""
#. module: hr
@ -446,7 +446,7 @@ msgstr ""
#. module: hr
#: constraint:hr.employee:0
msgid "Error ! You cannot create recursive hierarchy of Employee(s)."
msgid "Error! You cannot create recursive hierarchy of Employee(s)."
msgstr ""
#. module: hr

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

@ -157,7 +157,7 @@ msgstr ""
#. module: hr_attendance
#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:167
#, python-format
msgid "A sign-in must be right after a sign-out !"
msgid "A sign-in must be right after a sign-out!"
msgstr ""
#. module: hr_attendance
@ -306,7 +306,7 @@ msgstr ""
#. module: hr_attendance
#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:179
#, python-format
msgid "A sign-out must be right after a sign-in !"
msgid "A sign-out must be right after a sign-in!"
msgstr ""
#. module: hr_attendance

4
addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
View File

@ -164,7 +164,7 @@ class hr_sign_in_out(osv.osv_memory):
try:
self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_in')
except:
raise osv.except_osv(_('UserError'), _('A sign-in must be right after a sign-out !'))
raise osv.except_osv(_('UserError'), _('A sign-in must be right after a sign-out!'))
return {'type': 'ir.actions.act_window_close'} # To do: Return Success message
def sign_out(self, cr, uid, data, context=None):
@ -176,7 +176,7 @@ class hr_sign_in_out(osv.osv_memory):
try:
self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_out')
except:
raise osv.except_osv(_('UserError'), _('A sign-out must be right after a sign-in !'))
raise osv.except_osv(_('UserError'), _('A sign-out must be right after a sign-in!'))
return {'type': 'ir.actions.act_window_close'} # To do: Return Success message
hr_sign_in_out()

2
addons/hr_holidays/hr_holidays.py
View File

@ -202,7 +202,7 @@ class hr_holidays(osv.osv):
def unlink(self, cr, uid, ids, context=None):
for rec in self.browse(cr, uid, ids, context=context):
if rec.state<>'draft':
raise osv.except_osv(_('Warning!'),_('You cannot delete a leave, because it\'s not in draft state !'))
raise osv.except_osv(_('Warning!'),_('You cannot delete a leave, because it\'s not in draft state!'))
return super(hr_holidays, self).unlink(cr, uid, ids, context)
def onchange_date_from(self, cr, uid, ids, date_to, date_from):

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

@ -280,7 +280,7 @@ msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
#, python-format
msgid "You have to select at least 1 Department. And try again."
msgid "You have to select at least one Department. And try again."
msgstr ""
#. module: hr_holidays

2
addons/hr_holidays/wizard/hr_holidays_summary_department.py
View File

@ -41,7 +41,7 @@ class hr_holidays_summary_dept(osv.osv_memory):
def print_report(self, cr, uid, ids, context=None):
data = self.read(cr, uid, ids, [], context=context)[0]
if not data['depts']:
raise osv.except_osv(_('Error'), _('You have to select at least 1 Department. And try again.'))
raise osv.except_osv(_('Error'), _('You have to select at least one Department. And try again.'))
datas = {
'ids': [],
'model': 'ir.ui.menu',

2
addons/hr_timesheet/hr_timesheet.py
View File

@ -172,7 +172,7 @@ class hr_analytic_timesheet(osv.osv):
if emp_id:
ename = emp_obj.browse(cr, uid, emp_id[0], context=context).name
if not vals.get('journal_id',False):
raise osv.except_osv(_('Warning !'), _('Analytic journal is not defined for employee %s \nDefine an employee for the selected user and assign an analytic journal !')%(ename,))
raise osv.except_osv(_('Warning !'), _('No \'Analytic Journal\' defined for employee %s \nDefine an employee for the selected user and assign an \'Analytic Journal\'!')%(ename,))
if not vals.get('account_id',False):
raise osv.except_osv(_('Warning !'), _('No analytic account defined on the project.\nPlease set one or we cannot automatically fill the timesheet.'))
return super(hr_analytic_timesheet, self).create(cr, uid, vals, context=context)

10
addons/hr_timesheet/i18n/hr_timesheet.pot
View File

@ -30,7 +30,7 @@ msgstr ""
#. module: hr_timesheet
#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
#, python-format
msgid "No employee defined for your user !"
msgid "No employee defined for your user!"
msgstr ""
#. module: hr_timesheet
@ -158,7 +158,7 @@ msgstr ""
#. module: hr_timesheet
#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
#, python-format
msgid "No cost unit defined for this employee !"
msgid "No cost unit defined for this employee!"
msgstr ""
#. module: hr_timesheet
@ -322,8 +322,8 @@ msgstr ""
#. module: hr_timesheet
#: code:addons/hr_timesheet/hr_timesheet.py:175
#, python-format
msgid "Analytic journal is not defined for employee %s \n"
"Define an employee for the selected user and assign an analytic journal !"
msgid "No 'Analytic Journal' defined for employee %s \n"
"Define an employee for the selected user and assign an 'Analytic Journal'!"
msgstr ""
#. module: hr_timesheet
@ -599,7 +599,7 @@ msgstr ""
#. module: hr_timesheet
#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
#, python-format
msgid "No employee defined for this user !"
msgid "No employee defined for this user!"
msgstr ""
#. module: hr_timesheet

2
addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
View File

@ -39,7 +39,7 @@ class analytical_timesheet_employee(osv.osv_memory):
emp_obj = self.pool.get('hr.employee')
emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
if not emp_id:
raise osv.except_osv(_("Warning"), _("No employee defined for this user !"))
raise osv.except_osv(_("Warning"), _("No employee defined for this user!"))
return emp_id and emp_id[0] or False
_defaults = {

4
addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
View File

@ -74,7 +74,7 @@ class hr_so_project(osv.osv_memory):
res = timesheet_obj.default_get(cr, uid, ['product_id','product_uom_id'], context=context)
if not res['product_uom_id']:
raise osv.except_osv(_('UserError'), _('No cost unit defined for this employee !'))
raise osv.except_osv(_('UserError'), _('No cost unit defined for this employee!'))
up = timesheet_obj.on_change_unit_amount(cr, uid, False, res['product_id'], hour,False, res['product_uom_id'])['value']
res['name'] = data['info']
@ -129,7 +129,7 @@ class hr_si_project(osv.osv_memory):
emp_obj = self.pool.get('hr.employee')
emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
if not emp_id:
raise osv.except_osv(_('UserError'), _('No employee defined for your user !'))
raise osv.except_osv(_('UserError'), _('No employee defined for your user!'))
return False
def check_state(self, cr, uid, ids, context=None):

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

@ -864,7 +864,7 @@ msgstr ""
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:108
#, python-format
msgid "At least one line has no product !"
msgid "At least one line has no product!"
msgstr ""
#. module: hr_timesheet_invoice
@ -943,7 +943,7 @@ msgstr ""
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
#, python-format
msgid "No Records Found for Report!"
msgid "No record(s) found for Report!"
msgstr ""
#. module: hr_timesheet_invoice

2
addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
View File

@ -55,7 +55,7 @@ class account_analytic_profit(osv.osv_memory):
('user_id', 'in', data['form']['employee_ids']),
], context=context)
if not ids_chk:
raise osv.except_osv(_('Data Insufficient!'), _('No records found for Report!'))
raise osv.except_osv(_('Data Insufficient!'), _('No record(s) found for Report!'))
data['form']['journal_ids'] = [(6, 0, data['form']['journal_ids'])] # Improve me => Change the rml/sxw so that it can support withou [0][2]
data['form']['employee_ids'] = [(6, 0, data['form']['employee_ids'])]

2
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
View File

@ -99,7 +99,7 @@ class account_analytic_line(osv.osv):
for product_id, factor_id, qty, uom in cr.fetchall():
product = product_obj.browse(cr, uid, product_id, context2)
if not product:
raise osv.except_osv(_('Error'), _('At least one line has no product !'))
raise osv.except_osv(_('Error'), _('At least one line has no product!'))
factor_name = ''
factor = invoice_factor_obj.browse(cr, uid, factor_id, context2)
if not data.get('product', False):

6
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
View File

@ -271,7 +271,7 @@ class hr_timesheet_sheet(osv.osv):
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'hr_timesheet_sheet.sheet', sheet.id, 'confirm', cr)
else:
raise osv.except_osv(_('Warning !'), _('Please verify that the total difference of the sheet is lower than %.2f !') %(di,))
raise osv.except_osv(_('Warning !'), _('Please verify that the total difference of the sheet is lower than %.2f!') %(di,))
return True
def date_today(self, cr, uid, ids, context=None):
@ -612,7 +612,7 @@ class hr_attendance(osv.osv):
if 'sheet_id' in context:
ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, context['sheet_id'], context=context)
if ts.state not in ('draft', 'new'):
raise osv.except_osv(_('Error !'), _('You cannot modify an entry in a confirmed timesheet !'))
raise osv.except_osv(_('Error !'), _('You cannot modify an entry in a confirmed timesheet!'))
res = super(hr_attendance,self).create(cr, uid, vals, context=context)
if 'sheet_id' in context:
if context['sheet_id'] != self.browse(cr, uid, res, context=context).sheet_id.id:
@ -643,7 +643,7 @@ class hr_attendance(osv.osv):
def _check(self, cr, uid, ids):
for att in self.browse(cr, uid, ids):
if att.sheet_id and att.sheet_id.state not in ('draft', 'new'):
raise osv.except_osv(_('Error !'), _('You cannot modify an entry in a confirmed timesheet !'))
raise osv.except_osv(_('Error !'), _('You cannot modify an entry in a confirmed timesheet!'))
return True
hr_attendance()

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

@ -50,7 +50,7 @@ msgstr ""
#. module: hr_timesheet_sheet
#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
#, python-format
msgid "No employee defined for your user !"
msgid "No employee defined for your user!"
msgstr ""
#. module: hr_timesheet_sheet
@ -91,7 +91,7 @@ msgstr ""
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:274
#, python-format
msgid ""
"Please verify that the total difference of the sheet is lower than %.2f !"
"Please verify that the total difference of the sheet is lower than %.2f!"
msgstr ""
#. module: hr_timesheet_sheet
@ -149,7 +149,7 @@ msgstr ""
#. module: hr_timesheet_sheet
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
#, python-format
msgid "You cannot modify an entry in a confirmed timesheet !"
msgid "You cannot modify an entry in a confirmed timesheet!"
msgstr ""
#. module: hr_timesheet_sheet
@ -589,7 +589,7 @@ msgstr ""
#. module: hr_timesheet_sheet
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:646
#, python-format
msgid "You cannot modify an entry in a confirmed timesheet !"
msgid "You cannot modify an entry in a confirmed timesheet!"
msgstr ""
#. module: hr_timesheet_sheet

2
addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
View File

@ -35,7 +35,7 @@ class hr_timesheet_current_open(osv.osv_memory):
user_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context)
if not len(user_ids):
raise osv.except_osv(_('Error !'), _('No employee defined for your user !'))
raise osv.except_osv(_('Error !'), _('No employee defined for your user!'))
ids = ts.search(cr, uid, [('user_id','=',uid),('state','=','draft'),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))], context=context)
if len(ids) > 1: