From 490cc4a0cf767c4f2e97086b63aa450f1780be59 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 11 Apr 2012 17:33:29 +0530
Subject: [PATCH] [IMP]improve progress as per suggestion

bzr revid: sgo@tinyerp.com-20120411120329-as07fv3jd2hoeqxa
---
 addons/project/project.py       |    8 ++++++++
 addons/project/project_view.xml |    5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 71502dc..30da452 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -162,6 +162,13 @@ class project(osv.osv):
             task_ids = task_pool.search(cr, uid, [('project_id', '=', id)])
             open_task[id] = len(task_ids)
         return open_task
+    
+    def _cal_days(self, cr, uid, ids, field_name, arg, context=None):
+        cal_days = {}
+        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
+                
 
     _columns = {
         'complete_name': fields.function(_complete_name, string="Project Name", type='char', size=250),
@@ -202,6 +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"),
      }
     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 b1e3c90..e19ddc0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -167,7 +167,7 @@
             <field name="arch" type="xml">
                 <kanban>
                     <field name="effective_hours"/>
-                    <field name="total_hours"/>
+                    <field name="planned_hours"/>
                     <field name="date"/>
                     <field name="name"/>
                     <field name="members"/>
@@ -175,6 +175,7 @@
                     <field name="user_id"/>
                     <field name="date"/>
                     <field name="color"/>
+                    <field name="cal_days"/>
                     <field name="open_task"/>
                     <templates>
                         <t t-name="kanban-box">
@@ -216,7 +217,7 @@
                                             <tr>
                                                 <th align="left" width="70px">Progress</th>
                                                 <td align="left">
-                                                    <t t-esc="Math.round(record.effective_hours.raw_value/24)"/>/<t t-esc="Math.round(record.total_hours.raw_value/24)"/> days
+                                                    <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
                                                 </td>
                                             </tr>
                                         </table>
-- 
1.7.10.4