Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-opw-578618-port-mma into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-578618-port-mma/+merge/140874
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
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-578618-port-mma/+merge/140874
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-opw-578618-port-mma.
=== modified file 'hr_timesheet/wizard/hr_timesheet_sign_in_out.py'
--- hr_timesheet/wizard/hr_timesheet_sign_in_out.py 2012-12-17 14:43:06 +0000
+++ hr_timesheet/wizard/hr_timesheet_sign_in_out.py 2012-12-20 11:15:35 +0000
@@ -33,7 +33,7 @@
'date': fields.datetime('Closing Date'),
'analytic_amount': fields.float('Minimum Analytic Amount'),
'name': fields.char('Employees name', size=32, required=True, readonly=True),
- 'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True),
+ 'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], store=True, required=True, readonly=True),
'server_date': fields.datetime('Current Date', required=True, readonly=True),
'emp_id': fields.many2one('hr.employee', 'Employee ID')
}
@@ -111,7 +111,7 @@
_description = 'Sign In By Project'
_columns = {
'name': fields.char('Employees name', size=32, readonly=True),
- 'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True),
+ 'state': fields.related('emp_id', 'state', string='Current Status',type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], store=True, required=True, readonly=True),
'date': fields.datetime('Starting Date'),
'server_date': fields.datetime('Current Date', readonly=True),
'emp_id': fields.many2one('hr.employee', 'Employee ID')
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
