From 881148d4b16bd709b80a412e082576c852e9b4bb Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Fri, 13 Jul 2012 17:46:13 +0530 Subject: [PATCH] [IMP]hr-warning-message bzr revid: pna@tinyerp.com-20120713121613-poze6x6838cr9xpe --- addons/hr/hr.py | 4 ++-- addons/hr/i18n/hr.pot | 4 ++-- addons/hr_attendance/i18n/hr_attendance.pot | 4 ++-- .../hr_attendance/wizard/hr_attendance_sign_in_out.py | 4 ++-- addons/hr_holidays/hr_holidays.py | 2 +- addons/hr_holidays/i18n/hr_holidays.pot | 2 +- .../wizard/hr_holidays_summary_department.py | 2 +- addons/hr_timesheet/hr_timesheet.py | 2 +- addons/hr_timesheet/i18n/hr_timesheet.pot | 10 +++++----- .../hr_timesheet/wizard/hr_timesheet_print_employee.py | 2 +- addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py | 4 ++-- .../hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot | 4 ++-- .../wizard/hr_timesheet_analytic_profit.py | 2 +- .../wizard/hr_timesheet_invoice_create.py | 2 +- addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 6 +++--- addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot | 8 ++++---- .../hr_timesheet_sheet/wizard/hr_timesheet_current.py | 2 +- 17 files changed, 32 insertions(+), 32 deletions(-) diff --git a/addons/hr/hr.py b/addons/hr/hr.py index f335ceeeda3..f80540d8d7c 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -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() diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot index 080708599fa..9936c83ad6e 100644 --- a/addons/hr/i18n/hr.pot +++ b/addons/hr/i18n/hr.pot @@ -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 diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot index 62fa0968280..990f2aba606 100644 --- a/addons/hr_attendance/i18n/hr_attendance.pot +++ b/addons/hr_attendance/i18n/hr_attendance.pot @@ -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 diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py index 3a24ab6af4a..0583d478c19 100644 --- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py +++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py @@ -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() diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index 2ed5a04d937..d40df90171a 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -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): diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot index 8e0d2a3c50f..56dd8fe758c 100644 --- a/addons/hr_holidays/i18n/hr_holidays.pot +++ b/addons/hr_holidays/i18n/hr_holidays.pot @@ -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 diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py index f499a018c06..5f4a26b2a07 100644 --- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py +++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py @@ -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', diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py index 16ef535faa9..91057a2b38e 100644 --- a/addons/hr_timesheet/hr_timesheet.py +++ b/addons/hr_timesheet/hr_timesheet.py @@ -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) diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot index a0020e74cdb..ee1e9fbc8d6 100644 --- a/addons/hr_timesheet/i18n/hr_timesheet.pot +++ b/addons/hr_timesheet/i18n/hr_timesheet.pot @@ -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 diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py index b89f998f7cb..7ef99aa88e6 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py +++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py @@ -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 = { diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py index e3f7f0c7acb..d3b0d27e351 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py +++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py @@ -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): diff --git a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot index 18b61e03bc4..21df6be61e4 100644 --- a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot +++ b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot @@ -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 diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py index 76e0efd3bce..b4db228c938 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py @@ -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'])] diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py index f0fe3281bb0..0d3c26b1648 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py @@ -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): diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index 5fe44478fc6..26254271ca7 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -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() diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot index 0295fddd004..7e2f698f203 100644 --- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot +++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot @@ -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 diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py index 5a8fa2c59b3..4d19e7657d4 100644 --- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py +++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py @@ -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: