[Merge]: Merge with Parent branch

bzr revid: rpa@tinyerp.com-20091130054543-42dsu82bluet4jjy

1 files changed, 8 insertions, 3 deletions

diff --git a/addons/project/project.py b/addons/project/project.py
index edd03ee68e3..43572ecae7d 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -326,9 +326,14 @@ class task(osv.osv):
     # 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):
-        res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
-        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
-        if not tm:
+        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode or False
+        f = self.pool.get('res.company').fields_get(cr, uid, ['project_time_mode'], context)
+        word = 'Hours'
+        if tm:
+            word = dict(f['project_time_mode']['selection'])[tm]
+
+        res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
+        if (not tm) or (tm=='hours'):
             return res
         tm = tm.name
         f = self.pool.get('res.company').fields_get(cr, uid, ['project_time_mode_id'], context)