Ravi Gohil (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/6.0-opw-50624-rgo into 
lp:openobject-addons/6.0.

Requested reviews:
  Naresh(OpenERP) (nch-openerp)
  nel (nel-tinyerp)
  Priyesh (OpenERP) (pso-openerp)
  Ravi Gohil (OpenERP) (rgo-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-50624-rgo/+merge/92717

Hello Sir,

There is an issue with widget float_time in project task.

Widget float_time is not being set in 'planned_hours' field of task object with 
'project_time_mode_id' set to 'Hour/Hours' in Company Configuration when the 
Language is other than English.

This fixes the issue.

Thanks.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-50624-rgo/+merge/92717
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/6.0-opw-50624-rgo.
=== modified file 'project/project.py'
--- project/project.py	2011-01-18 22:45:39 +0000
+++ project/project.py	2012-02-13 07:07:19 +0000
@@ -502,11 +502,11 @@
         # read uom as admin to avoid access rights issues, e.g. for portal/share users,
         # this should be safe (no context passed to avoid side-effects)
         obj_tm = users_obj.browse(cr, 1, uid, context=context).company_id.project_time_mode_id
-        tm = obj_tm and obj_tm.name or 'Hours'
+        tm = obj_tm and obj_tm.name or _('Hours')
 
         res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
 
-        if tm in ['Hours','Hour']:
+        if tm in [_('Hours'),_('Hour')]:
             return res
 
         eview = etree.fromstring(res['arch'])
@@ -523,8 +523,8 @@
         res['arch'] = etree.tostring(eview)
 
         for f in res['fields']:
-            if 'Hours' in res['fields'][f]['string']:
-                res['fields'][f]['string'] = res['fields'][f]['string'].replace('Hours',tm)
+            if _('Hours') in res['fields'][f]['string']:
+                res['fields'][f]['string'] = res['fields'][f]['string'].replace(_('Hours'), tm)
         return res
 
     def action_close(self, cr, uid, ids, context=None):

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to