Merge lp:~syleam/openobject-addons/trunk-lp-1080191-sla into lp:openobject-addons

[Sebastien LANGE - http://www.Syleam.fr]

Unmerged revisions

8072. By Sebastien LANGE - http://www.Syleam.fr on 2012-11-17

[FIX] Widget float_time in project task if 'Hour' is translate

=== modified file 'project/project.py'
--- project/project.py	2012-11-15 12:38:51 +0000
+++ project/project.py	2012-11-17 21:40:27 +0000
@@ -887,6 +887,10 @@
     # Override view according to the company definition
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         users_obj = self.pool.get('res.users')
+        translation_obj = self.pool.get('ir.translation')
+        is_hour = translation_obj.search(cr, uid, [('name', '=', 'product.uom,name'), ('src', 'in', ['Hour', 'Hours'])])
+        translated = [str(i.value) for i in translation_obj.browse(cr, uid, is_hour, context=context)]
+        translated.extend(['Hour','Hours'])
         if context is None: context = {}
         # 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)
@@ -895,7 +899,7 @@
 
         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 translated:
             return res
 
         eview = etree.fromstring(res['arch'])