Index: openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/task-procs.tcl,v
diff -u -r1.4.2.10 -r1.4.2.11
--- openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	19 Aug 2004 00:01:27 -0000	1.4.2.10
+++ openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	27 Aug 2004 16:21:00 -0000	1.4.2.11
@@ -1666,9 +1666,9 @@
 
 
 ad_proc -public pm::task::hours_remaining {
-    -hours_work:required
-    -hours_work_min:required
-    -hours_work_max:required
+    -estimated_hours_work:required
+    -estimated_hours_work_min:required
+    -estimated_hours_work_max:required
     -percent_complete:required
 } {
     Displays the estimated hours work remaining in a consistent format
@@ -1696,9 +1696,9 @@
 
     if {[string equal $percent_complete 0]} {
         return [pm::task::estimated_hours_work \
-                    -hours_work $hours_work \
-                    -hours_work_min $hours_work_min \
-                    -hours_work_max $hours_work_max]
+                    -estimated_hours_work $estimated_hours_work \
+                    -estimated_hours_work_min $estimated_hours_work_min \
+                    -estimated_hours_work_max $estimated_hours_work_max]
     }
 
     if {[string is true $use_uncertain_completion_times_p]} {
@@ -1720,20 +1720,20 @@
 
 
 ad_proc -public pm::task::estimated_hours_work {
-    -hours_work:required
-    -hours_work_min:required
-    -hours_work_max:required
+    -estimated_hours_work:required
+    -estimated_hours_work_min:required
+    -estimated_hours_work_max:required
 } {
     Displays the total estimated hours work in a consistent format
     
     @author Jade Rubick (jader@bread.com)
     @creation-date 2004-06-02
     
-    @param hours_work
+    @param estimated_hours_work
 
-    @param hours_work_min
+    @param estimated_hours_work_min
 
-    @param hours_work_max
+    @param estimated_hours_work_max
 
     @return 
     
@@ -1742,10 +1742,10 @@
     set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"]
 
     if {[string equal $use_uncertain_completion_times_p 1]} {
-        if {[string equal $hours_work_min $hours_work_max]} {
-            set display_value "$hours_work_min"
+        if {[string equal $estimated_hours_work_min $estimated_hours_work_max]} {
+            set display_value "$estimated_hours_work_min"
         } else {
-            set display_value "$hours_work_min - $hours_work_max"
+            set display_value "$estimated_hours_work_min - $estimated_hours_work_max"
         }
     } else {
         set display_value "$estimated_hours_work"
Index: openacs-4/contrib/packages/project-manager/www/task-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.tcl,v
diff -u -r1.24.2.3 -r1.24.2.4
--- openacs-4/contrib/packages/project-manager/www/task-one.tcl	9 Jul 2004 17:38:28 -0000	1.24.2.3
+++ openacs-4/contrib/packages/project-manager/www/task-one.tcl	27 Aug 2004 16:21:01 -0000	1.24.2.4
@@ -110,9 +110,9 @@
 
 set task_info(hours_remaining) \
     [pm::task::hours_remaining \
-         -hours_work $task_info(estimated_hours_work) \
-         -hours_work_min $task_info(estimated_hours_work_min) \
-         -hours_work_max $task_info(estimated_hours_work_max) \
+         -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)]
 
 # format the dates according to the local settings
Index: openacs-4/contrib/packages/project-manager/www/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks.tcl,v
diff -u -r1.5.2.4 -r1.5.2.5
--- openacs-4/contrib/packages/project-manager/www/tasks.tcl	9 Jul 2004 17:48:26 -0000	1.5.2.4
+++ openacs-4/contrib/packages/project-manager/www/tasks.tcl	27 Aug 2004 16:21:01 -0000	1.5.2.5
@@ -253,9 +253,9 @@
 
     set hours_remaining \
         [pm::task::hours_remaining \
-             -hours_work $estimated_hours_work \
-             -hours_work_min $estimated_hours_work_min \
-             -hours_work_max $estimated_hours_work_max \
+             -estimated_hours_work $estimated_hours_work \
+             -estimated_hours_work_min $estimated_hours_work_min \
+             -estimated_hours_work_max $estimated_hours_work_max \
              -percent_complete $percent_complete]
 
 }