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

[IMP]hr-warning-message 

bzr revid: pna@tinyerp.com-20120713070425-b3envibswfdt6umq
This commit is contained in:
Pinakin Nayi (OpenERP) 2012-07-13 12:34:25 +05:30
parent 6cbb04758a
commit 27226c12b2
25 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr/hr.py
View File

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

2
addons/hr/hr_department.py
View File

@ -76,7 +76,7 @@ class hr_department(osv.osv):
return True
_constraints = [
(_check_recursion, 'Error! You can not create recursive departments.', ['parent_id'])
(_check_recursion, 'Error! You cannot create recursive departments.', ['parent_id'])
]
hr_department()

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

@ -47,7 +47,7 @@ msgstr ""
#. module: hr
#: constraint:hr.department:0
msgid "Error! You can not create recursive departments."
msgid "Error! You cannot create recursive departments."
msgstr ""
#. module: hr
@ -446,7 +446,7 @@ msgstr ""
#. module: hr
#: constraint:hr.employee:0
msgid "Error ! You cannot create recursive Hierarchy of Employees."
msgid "Error ! You cannot create recursive hierarchy of Employee(s)."
msgstr ""
#. module: hr

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 tried to %s with a date anterior to another event !\nTry to contact the administrator to correct attendances.')%(warning_sign,))
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,))
res = {'action': type, 'employee_id': emp['id']}
if dt:

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

@ -58,7 +58,7 @@ msgstr ""
#. module: hr_attendance
#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:161
#, python-format
msgid "The sign-out date must be in the past"
msgid "The sign-out date must be in the past."
msgstr ""
#. module: hr_attendance
@ -151,7 +151,7 @@ msgstr ""
#. module: hr_attendance
#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
#, python-format
msgid "The Sign-in date must be in the past"
msgid "The sign-in date must be in the past."
msgstr ""
#. module: hr_attendance

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

@ -158,7 +158,7 @@ class hr_sign_in_out(osv.osv_memory):
emp_id = data['emp_id']
if 'last_time' in data:
if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
raise osv.except_osv(_('UserError'), _('The sign-out date must be in the past'))
raise osv.except_osv(_('UserError'), _('The sign-out date must be in the past.'))
self.pool.get('hr.attendance').create(cr, uid, {'name': data['last_time'], 'action': 'sign_out',
'employee_id': emp_id}, context=context)
try:
@ -171,7 +171,7 @@ class hr_sign_in_out(osv.osv_memory):
emp_id = data['emp_id']
if 'last_time' in data:
if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
raise osv.except_osv(_('UserError'), _('The Sign-in date must be in the past'))
raise osv.except_osv(_('UserError'), _('The sign-in date must be in the past.'))
self.pool.get('hr.attendance').create(cr, uid, {'name':data['last_time'], 'action':'sign_in', 'employee_id':emp_id}, context=context)
try:
self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_out')

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 lower then 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 lower then 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 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 in waiting answer or draft."
"state"
msgstr ""

4
addons/hr_expense/hr_expense.py
View File

@ -171,7 +171,7 @@ class hr_expense_expense(osv.osv):
else:
acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company_id})
if not acc:
raise osv.except_osv(_('Error !'), _('Please configure Default Expense account for Product purchase, `property_account_expense_categ`'))
raise osv.except_osv(_('Error !'), _('Please configure Default Expense account for Product purchase., `property_account_expense_categ`'))
lines.append((0, False, {
'name': l.name,
'account_id': acc.id,
@ -183,7 +183,7 @@ class hr_expense_expense(osv.osv):
'account_analytic_id': l.analytic_account.id,
}))
if not exp.employee_id.address_home_id:
raise osv.except_osv(_('Error !'), _('The employee must have a Home address.'))
raise osv.except_osv(_('Error !'), _('The employee must have a home address.'))
acc = exp.employee_id.address_home_id.property_account_payable.id
payment_term_id = exp.employee_id.address_home_id.property_payment_term.id
inv = {

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

@ -266,7 +266,7 @@ msgstr ""
#: code:addons/hr_expense/hr_expense.py:173
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
"Please configure Default Expense account for Product purchase., "
"`property_account_expense_categ`"
msgstr ""
@ -542,7 +542,7 @@ msgstr ""
#. module: hr_expense
#: code:addons/hr_expense/hr_expense.py:185
#, python-format
msgid "The employee must have a Home address."
msgid "The employee must have a home address."
msgstr ""
#. module: hr_expense

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 1 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 1 Department. And try again.'))
datas = {
'ids': [],
'model': 'ir.ui.menu',

10
addons/hr_payroll/hr_payroll.py
View File

@ -859,18 +859,18 @@ result = rules.NET > categories.NET * 0.10''',
try:
return rule.amount_fix, eval(rule.quantity, localdict), 100.0
except:
raise osv.except_osv(_('Error'), _('Wrong quantity defined for salary rule %s (%s)')% (rule.name, rule.code))
raise osv.except_osv(_('Error'), _('Wrong quantity defined for salary rule %s (%s).')% (rule.name, rule.code))
elif rule.amount_select == 'percentage':
try:
return eval(rule.amount_percentage_base, localdict), eval(rule.quantity, localdict), rule.amount_percentage
except:
raise osv.except_osv(_('Error'), _('Wrong percentage base or quantity defined for salary rule %s (%s)')% (rule.name, rule.code))
raise osv.except_osv(_('Error'), _('Wrong percentage base or quantity defined for salary rule %s (%s).')% (rule.name, rule.code))
else:
try:
eval(rule.amount_python_compute, localdict, mode='exec', nocopy=True)
return localdict['result'], 'result_qty' in localdict and localdict['result_qty'] or 1.0, 'result_rate' in localdict and localdict['result_rate'] or 100.0
except:
raise osv.except_osv(_('Error'), _('Wrong python code defined for salary rule %s (%s) ')% (rule.name, rule.code))
raise osv.except_osv(_('Error'), _('Wrong python code defined for salary rule %s (%s).')% (rule.name, rule.code))
def satisfy_condition(self, cr, uid, rule_id, localdict, context=None):
"""
@ -887,13 +887,13 @@ result = rules.NET > categories.NET * 0.10''',
result = eval(rule.condition_range, localdict)
return rule.condition_range_min <= result and result <= rule.condition_range_max or False
except:
raise osv.except_osv(_('Error'), _('Wrong range condition defined for salary rule %s (%s)')% (rule.name, rule.code))
raise osv.except_osv(_('Error'), _('Wrong range condition defined for salary rule %s (%s).')% (rule.name, rule.code))
else: #python code
try:
eval(rule.condition_python, localdict, mode='exec', nocopy=True)
return 'result' in localdict and localdict['result'] or False
except:
raise osv.except_osv(_('Error'), _('Wrong python condition defined for salary rule %s (%s)')% (rule.name, rule.code))
raise osv.except_osv(_('Error'), _('Wrong python condition defined for salary rule %s (%s).')% (rule.name, rule.code))
hr_salary_rule()

12
addons/hr_payroll/i18n/hr_payroll.pot
View File

@ -551,7 +551,7 @@ msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/hr_payroll.py:872
#, python-format
msgid "Wrong python code defined for salary rule %s (%s) "
msgid "Wrong python code defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
@ -711,13 +711,13 @@ msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
#, python-format
msgid "You must select employee(s) to generate payslip(s)"
msgid "You must select employee(s) to generate payslip(s)."
msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/hr_payroll.py:861
#, python-format
msgid "Wrong quantity defined for salary rule %s (%s)"
msgid "Wrong quantity defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
@ -784,7 +784,7 @@ msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/hr_payroll.py:895
#, python-format
msgid "Wrong python condition defined for salary rule %s (%s)"
msgid "Wrong python condition defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
@ -928,7 +928,7 @@ msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/hr_payroll.py:889
#, python-format
msgid "Wrong range condition defined for salary rule %s (%s)"
msgid "Wrong range condition defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
@ -1001,7 +1001,7 @@ msgstr ""
#. module: hr_payroll
#: code:addons/hr_payroll/hr_payroll.py:866
#, python-format
msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
msgid "Wrong percentage base or quantity defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll

2
addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
View File

@ -49,7 +49,7 @@ class hr_payslip_employees(osv.osv_memory):
to_date = run_data.get('date_end', False)
credit_note = run_data.get('credit_note', False)
if not data['employee_ids']:
raise osv.except_osv(_("Warning !"), _("You must select employee(s) to generate payslip(s)"))
raise osv.except_osv(_("Warning !"), _("You must select employee(s) to generate payslip(s)."))
for emp in emp_pool.browse(cr, uid, data['employee_ids'], context=context):
slip_data = slip_pool.onchange_employee_id(cr, uid, [], from_date, to_date, emp.id, contract_id=False, context=context)
res = {

4
addons/hr_timesheet/hr_timesheet.py
View File

@ -172,9 +172,9 @@ 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 !'), _('Analytic journal is not 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 can not automatically fill the timesheet.'))
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)
def on_change_user_id(self, cr, uid, ids, user_id):

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

@ -323,7 +323,7 @@ msgstr ""
#: 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!"
"Define an employee for the selected user and assign an analytic journal !"
msgstr ""
#. module: hr_timesheet
@ -577,7 +577,7 @@ msgstr ""
#: code:addons/hr_timesheet/hr_timesheet.py:177
#, python-format
msgid "No analytic account defined on the project.\n"
"Please set one or we can not automatically fill the timesheet."
"Please set one or we cannot automatically fill the timesheet."
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 = {

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

@ -530,7 +530,7 @@ msgstr ""
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:132
#, python-format
msgid "No income account defined for product '%s'"
msgid "No income account defined for product '%s'."
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 records 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

@ -123,7 +123,7 @@ class account_analytic_line(osv.osv):
tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
if not account_id:
raise osv.except_osv(_("Configuration Error"), _("No income account defined for product '%s'") % product.name)
raise osv.except_osv(_("Configuration Error"), _("No income account defined for product '%s'.") % product.name)
curr_line = {
'price_unit': price,
'quantity': qty,

4
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 an other date than today.'))
return True
def sign(self, cr, uid, ids, typ, 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:

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

@ -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
@ -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 an other date than today."
msgstr ""
#. module: hr_timesheet_sheet