Merge lp:~openerp-dev/openobject-addons/trunk-opw-578618-port-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello,

steps to reproduce

- Install hr_timesheet, hr_attendance
- Install lang other than English,
- Goto menu: `Human Resources --> Attendances`, and process `Sign in / Sign out` and `Sign in / Sign out by project` wizards,

You will find values for `state` field as `absent` and `present` which should not be translated.
This fix will enable translation for these two words by replacing keys with string.
code is forward port from 6.1

Thanks,
Mayur

[Fabien (Open ERP) (fp-tinyerp)]

you should better change the state field into a selection instead of a char field.

[lp:~openerp-dev/openobject-addons/trunk-opw-578618-port-mma]

8082. By Mayur Maheshwari(OpenERP) on 2012-12-20

[IMP]hr_timesheet: added selcetion type instead of a char field

Unmerged revisions

8082. By Mayur Maheshwari(OpenERP) on 2012-12-20

[IMP]hr_timesheet: added selcetion type instead of a char field

8081. By Ravi Gohil (OpenERP) on 2012-11-20

[FIX]hr_timesheet: word absent and present is not returned translated in wizard

=== modified file 'hr_timesheet/wizard/hr_timesheet_sign_in_out.py'
--- hr_timesheet/wizard/hr_timesheet_sign_in_out.py	2012-10-24 20:14:24 +0000
+++ hr_timesheet/wizard/hr_timesheet_sign_in_out.py	2012-11-20 12:58:24 +0000
@@ -43,7 +43,8 @@
         emp_ids = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
         if emp_ids:
             for employee in emp_obj.browse(cr, uid, emp_ids, context=context):
-                return {'name': employee.name, 'state': employee.state, 'emp_id': emp_ids[0], 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')}
+                state = _('Present') if employee.state == 'present' else _('Absent')
+                return {'name': employee.name, 'state': state, 'emp_id': emp_ids[0], 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')}
 
     def _get_empid2(self, cr, uid, context=None):
         res = self._get_empid(cr, uid, context=context)
@@ -165,7 +166,8 @@
         emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
         if emp_id:
             for employee in emp_obj.browse(cr, uid, emp_id, context=context):
-                res.update({'name': employee.name, 'state': employee.state, 'emp_id': emp_id[0], 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')})
+                state = _('Present') if employee.state == 'present' else _('Absent')
+                res.update({'name': employee.name, 'state': state, 'emp_id': emp_id[0], 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')})
         return res
 
 hr_si_project()