Index: openacs-4/packages/project-manager/lib/task-dates-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/task-dates-portlet.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/project-manager/lib/task-dates-portlet.adp	17 Sep 2005 10:23:36 -0000	1.3
+++ openacs-4/packages/project-manager/lib/task-dates-portlet.adp	23 Mar 2007 07:52:26 -0000	1.4
@@ -51,10 +51,10 @@
           <td>@task_info.percent_complete@%</td>
         </tr>
 	</if>
-        <if @task_info.estimate_hours_work@ not nil>
+        <if @task_info.hours_remaining@ not nil>
         <tr>
           <td class="subheader" width="40%">#project-manager.Estimated_hours_work#</td>
-          <td>@task_info.estimated_hours_work@</td>
+          <td>@task_info.hours_remaining@ (@task_info.estimated_hours_work_min@ - @task_info.estimated_hours_work_max@)</td>
         </tr>
 	</if>
       </table>
Index: openacs-4/packages/project-manager/lib/task-dates-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/task-dates-portlet.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/project-manager/lib/task-dates-portlet.tcl	19 Jun 2006 06:35:45 -0000	1.4
+++ openacs-4/packages/project-manager/lib/task-dates-portlet.tcl	23 Mar 2007 07:52:26 -0000	1.5
@@ -25,7 +25,7 @@
          -estimated_hours_work $task_info(estimated_hours_work) \
          -estimated_hours_work_min $task_info(estimated_hours_work_min) \
          -estimated_hours_work_max $task_info(estimated_hours_work_max) \
-         -percent_complete $task_info(percent_complete)]
+         -percent_complete $task_info(percent_complete) -round_p 1]
 
 set task_info(days_remaining) \
     [pm::task::days_remaining \
Index: openacs-4/packages/project-manager/tcl/task-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/task-procs.tcl,v
diff -u -N -r1.25 -r1.26
--- openacs-4/packages/project-manager/tcl/task-procs.tcl	31 Jan 2007 15:34:14 -0000	1.25
+++ openacs-4/packages/project-manager/tcl/task-procs.tcl	23 Mar 2007 07:52:25 -0000	1.26
@@ -1637,6 +1637,7 @@
     -estimated_hours_work_min:required
     -estimated_hours_work_max:required
     -percent_complete:required
+    {-round_p "0"}
 } {
     Displays the estimated hours work remaining in a consistent format
     
@@ -1656,6 +1657,11 @@
     @error 
 } {
     set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"]
+    
+    # If we should round, we are not using the uncertain_completion_times
+    if {$round_p} {
+	set use_uncertain_completition_times_p 0
+    }
 
     if {[string equal $percent_complete 100]} {
         return 0
@@ -1669,7 +1675,8 @@
         return [pm::task::estimated_hours_work \
                     -estimated_hours_work $estimated_hours_work \
                     -estimated_hours_work_min $estimated_hours_work_min \
-                    -estimated_hours_work_max $estimated_hours_work_max]
+                    -estimated_hours_work_max $estimated_hours_work_max \
+		    -round_p $round_p]
     }
 
     if {[string is true $use_uncertain_completion_times_p]} {
@@ -1757,6 +1764,7 @@
     -estimated_hours_work:required
     -estimated_hours_work_min:required
     -estimated_hours_work_max:required
+    {-round_p "0"}
 } {
     Displays the total estimated hours work in a consistent format
     
@@ -1774,8 +1782,14 @@
     @error 
 } {
     set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"]
+    # If we should round, we are not using the uncertain_completion_times
+ns_log Notice "round $round_p"
+    if {$round_p} {
+	set use_uncertain_completion_times_p 0
+    }
 
     if {[string equal $use_uncertain_completion_times_p 1]} {
+ns_log Notice "uncertain"
         if {[string equal $estimated_hours_work_min $estimated_hours_work_max]} {
             set display_value "$estimated_hours_work_min"
         } else {