From ff4a2b1c757651bee0d86ac926818af4a02d8847 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 11 Apr 2012 18:45:11 +0530
Subject: [PATCH] [IMP]

bzr revid: sgo@tinyerp.com-20120411131511-d5ozvnd62n52wa2c
---
 addons/project/project.py       | 10 +++++-----
 addons/project/project_view.xml |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 30da4522e0d..a77ef17872b 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -163,11 +163,11 @@ class project(osv.osv):
             open_task[id] = len(task_ids)
         return open_task
     
-    def _cal_days(self, cr, uid, ids, field_name, arg, context=None):
-        cal_days = {}
+    def _uom_company(self, cr, uid, ids, field_name, arg, context=None):
+        uom_company = {}
         for project in self.browse(cr,uid,ids):
-            cal_days[project.id] = project.company_id.project_time_mode_id.factor or 8
-        return cal_days
+            uom_company[project.id] = project.company_id.project_time_mode_id.name or "Hour"
+        return uom_company
                 
 
     _columns = {
@@ -209,7 +209,7 @@ class project(osv.osv):
         'task': fields.boolean('Task',help = "If you check this field tasks appears in kanban view"),
         'open_task': fields.function(_open_task , type='integer',string="Open Tasks"),
         'color': fields.integer('Color Index'),
-        'cal_days': fields.function(_cal_days ,type="integer", string="Calculate Days"),
+        'uom_company': fields.function(_uom_company , type='string'),
      }
     def dummy(self, cr, uid, ids, context=None):
             return False
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 4f2f87de8ca..d570b7c10fc 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -175,7 +175,6 @@
                     <field name="user_id"/>
                     <field name="date"/>
                     <field name="color"/>
-                    <field name="cal_days"/>
                     <field name="open_task"/>
                     <templates>
                         <t t-name="kanban-box">
@@ -217,7 +216,7 @@
                                             <tr>
                                                 <th align="left" width="70px">Progress</th>
                                                 <td align="left">
-                                                    <t t-esc="Math.round(record.effective_hours.raw_value/record.cal_days.value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value/record.cal_days.value)"/> days
+                                                    <t t-esc="record.effective_hours.raw_value"/>/<t t-esc="record.planned_hours.raw_value"/> <field name="uom_company"/>
                                                 </td>
                                             </tr>
                                         </table>