Index: openacs-4/packages/project-manager/lib/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/tasks.tcl,v
diff -u -r1.54 -r1.55
--- openacs-4/packages/project-manager/lib/tasks.tcl	10 May 2006 19:40:52 -0000	1.54
+++ openacs-4/packages/project-manager/lib/tasks.tcl	22 May 2006 06:16:44 -0000	1.55
@@ -161,13 +161,12 @@
 if {![exists_and_not_null elements]} {
     set elements [list \
 		      task_item_id \
+		      priority \
 		      title \
-		      slack_time \
 		      role \
-		      latest_start \
 		      end_date \
 		      status_type \
-		      remaining \
+		      estimated_hours_work_max \
 		      worked \
 		      project_item_id \
 		      percent_complete \
@@ -340,7 +339,7 @@
 			   } \
 			   priority {
 			       orderby_asc "priority, earliest_start, task_item_id asc"
-			       orderby_desc "priority desc, earliest_start desc, task_item_id desc"
+			       orderby_desc "priority desc, task_item_id desc,  earliest_start desc"
 			       default_direction desc
 			   } \
 			   end_date {
Index: openacs-4/packages/project-manager/tcl/install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/install-procs.tcl,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/project-manager/tcl/install-procs.tcl	18 Nov 2005 01:20:29 -0000	1.26
+++ openacs-4/packages/project-manager/tcl/install-procs.tcl	22 May 2006 06:16:44 -0000	1.27
@@ -149,7 +149,7 @@
         -from_version_name $from_version_name \
         -to_version_name $to_version_name \
         -spec {
-	    3.0b4 3.1d12 {
+	    3.1d11 3.1d12 {
                 ns_log notice "Running Post-Upgrade Routine"
 		db_transaction {
 		    content::type::attribute::new -content_type {pm_project} -attribute_name {project_code} -datatype {string} -pretty_name {[_ project-manager.Project_code]} -pretty_plural {[_ project-manager.Project_codes]} -column_spec {varchar(255)}
@@ -166,7 +166,6 @@
 		    content::type::attribute::new -content_type {pm_project} -attribute_name {actual_hours_completed} -datatype {number} -pretty_name {[_ project-manager.lt_Actual_hours_complete]} -pretty_plural {[_ project-manager.lt_Actual_hours_complete]} -column_spec {numeric}
 		    content::type::attribute::new -content_type {pm_project} -attribute_name {estimated_hours_total} -datatype {number} -pretty_name {[_ project-manager.lt_Estimated_hours_total]} -pretty_plural {[_ project-manager.lt_Estimated_hours_total]} -column_spec {numeric}
 		    content::type::attribute::new -content_type {pm_project} -attribute_name {logger_project} -datatype {integer} -pretty_name {[_ project-manager.lt_Linked_logger_project]} -pretty_plural {[_ project-manager.lt_Linked_logger_project_1]} -column_spec {integer}
-
 		    content::type::attribute::new -content_type {pm_task} -attribute_name {priority} -datatype {integer} -pretty_name {[_ project-manager.Priority_1]} -pretty_plural {[_ project-manager.Priorities]} -column_spec {integer}
 		
                 }
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 -r1.20 -r1.21
--- openacs-4/packages/project-manager/tcl/task-procs.tcl	3 May 2006 18:02:12 -0000	1.20
+++ openacs-4/packages/project-manager/tcl/task-procs.tcl	22 May 2006 06:16:44 -0000	1.21
@@ -2669,7 +2669,7 @@
 } {
     if {[empty_string_p $set]} {
         
-        set default_orderby "end_date,asc"
+        set default_orderby "priority,desc"
         
         set return_val [ad_get_client_property \
                             -default $default_orderby \
Index: openacs-4/packages/project-manager/templates/task-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/task-ae.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/project-manager/templates/task-ae.tcl	10 May 2006 18:51:42 -0000	1.8
+++ openacs-4/packages/project-manager/templates/task-ae.tcl	22 May 2006 06:16:44 -0000	1.9
@@ -37,7 +37,6 @@
     set logger_project [lindex [application_data_link::get_linked -from_object_id $project_item_id -to_object_type logger_project] 0]
     set logger_variable_id [logger::project::get_primary_variable -project_id $logger_project]
     logger::variable::get -variable_id $logger_variable_id -array logger_variable
-    set logger_variable(unit) "[_ [regsub -all {#} $logger_variable(unit) ""]]"
 
     set open_p [pm::project::open_p -project_item_id $project_item_id]
     if {[string is false $open_p]} {
@@ -169,7 +168,7 @@
     ad_form -extend -name task_add_edit \
 	-form {
 	    {comment:text(textarea),optional
-		{label "[_ project-manager.Description_1]"}
+		{label "[_ project-manager.Comment]"}
 		{html { rows 7 cols 40 wrap soft}}
 		{section "[_ project-manager.Comment]"}
 	    }
@@ -588,7 +587,7 @@
         # -------------------------------------
 
 	set logger_project [lindex [application_data_link::get_linked -from_object_id $project_item_id -to_object_type logger_project] 0]
-       
+	ns_log Notice "Hours:: $hours,,, $priority"
         if {[exists_and_not_null hours]} {
 
             pm::project::log_hours \