openerp-dev-web team mailing list archive

["pso \(Open ERP\)" <pso@xxxxxxxxxxx>]

pso (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-746422-pso into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #746422 in OpenERP Addons: "[6.1 trunk] [hr_timesheet_sheet] : You can not sign in from an other date than today"
  https://bugs.launchpad.net/openobject-addons/+bug/746422

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-746422-pso/+merge/55896

Fixed bug: 746422 (https://bugs.launchpad.net/openobject-addons/+bug/746422)
Improved Exception coming on Sign In and Sign Out button in hr_timesheet_sheet module.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-746422-pso/+merge/55896
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-746422-pso.

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py	2011-03-14 09:38:54 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py	2011-04-01 10:43:26 +0000
@@ -251,7 +251,7 @@
         if context is None:
             context = {}
         if not sheet.date_current == time.strftime('%Y-%m-%d'):
-            raise osv.except_osv(_('Error !'), _('You can not sign in from an other date than today'))
+            raise osv.except_osv(_('Error !'), _('You cannot %s from an other date than today') % (' '.join(typ.title().split('_'))))
         emp_id = sheet.employee_id.id
         context['sheet_id']=ids[0]
         emp_obj.attendance_action_change(cr, uid, [emp_id], type=typ, context=context,)