Index: openacs-4/packages/contacts/lib/contact-relationships-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-relationships-portlet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/contact-relationships-portlet.tcl	12 Oct 2005 22:39:08 -0000	1.1
+++ openacs-4/packages/contacts/lib/contact-relationships-portlet.tcl	16 Oct 2005 12:45:38 -0000	1.2
@@ -1,3 +1,2 @@
 set portlet_layout [parameter::get -parameter "DefaultPortletLayout"]
 
-
Index: openacs-4/packages/contacts/lib/contact-relationships-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-relationships-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/contacts/lib/contact-relationships-postgresql.xql	24 Sep 2005 11:31:47 -0000	1.3
+++ openacs-4/packages/contacts/lib/contact-relationships-postgresql.xql	16 Oct 2005 12:45:38 -0000	1.4
@@ -3,9 +3,8 @@
 
 <fullquery name="get_relationships">
       <querytext>
-select rel_id, other_name, other_party_id, role_singular, role_plural, rel_type, sort_name
-  from ( select CASE WHEN object_id_one = :party_id THEN contact__name(object_id_two,'t') ELSE contact__name(object_id_one,'t') END as sort_name,
-                CASE WHEN object_id_one = :party_id THEN contact__name(object_id_two) ELSE contact__name(object_id_one) END as other_name,
+select rel_id, other_name, other_party_id, role_singular, role_plural, rel_type
+  from ( select CASE WHEN object_id_one = :party_id THEN contact__name(object_id_two,'t') ELSE contact__name(object_id_one,'t') END as other_name,
 		CASE WHEN object_id_one = :party_id THEN object_id_two ELSE object_id_one END as other_party_id,
                 CASE WHEN object_id_one = :party_id THEN role_two ELSE role_one END as role,
                 CASE WHEN object_id_one = :party_id THEN acs_rel_type__role_pretty_name(role_two) ELSE acs_rel_type__role_pretty_name(role_one) END as role_singular,
@@ -17,7 +16,7 @@
             and ( object_id_one = :party_id or object_id_two = :party_id )
             and acs_rels.rel_type in ( select object_type from acs_object_types where supertype = 'contact_rel')
        ) rels_temp
- order by upper(role_singular) asc, upper(sort_name)
+ order by upper(role_singular) asc, upper(other_name)
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/contacts/lib/projects-billable-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/projects-billable-portlet.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/projects-billable-portlet.adp	12 Oct 2005 22:39:08 -0000	1.1
+++ openacs-4/packages/contacts/lib/projects-billable-portlet.adp	16 Oct 2005 12:45:38 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="@portlet_layout@">
-<property name="portlet_title"><a href="/invoices">#invoices.Billable_Projects#</a></property>
+<property name="portlet_title"><a href="/invoices/projects-billable?organization_id=@organization_id@"">#invoices.Billable_Projects#</a></property>
 
 <table width="100%">
 <tr>
@@ -11,7 +11,8 @@
                 organization_id="@organization_id@"
                 elements="@elements@"
                 package_id="@package_id@"
-                base_url="@base_url@" />
+                base_url="@base_url@"
+		no_actions_p="1" />
         </td>
       </tr>
     </table>
Index: openacs-4/packages/contacts/lib/tasks-tasks-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/tasks-tasks-portlet.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/lib/tasks-tasks-portlet.adp	14 Oct 2005 17:57:52 -0000	1.2
+++ openacs-4/packages/contacts/lib/tasks-tasks-portlet.adp	16 Oct 2005 12:45:38 -0000	1.3
@@ -11,6 +11,8 @@
 	     <include
         	src="/packages/tasks/lib/tasks"
 	        party_id="@party_id@"
+                row_list="@row_list@"
+                package_id="@package_id@"
         	hide_form_p="t" 
 		page="@page@"
 		tasks_orderby="@tasks_orderby@"
Index: openacs-4/packages/contacts/lib/tasks-tasks-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/tasks-tasks-portlet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/tasks-tasks-portlet.tcl	12 Oct 2005 22:39:08 -0000	1.1
+++ openacs-4/packages/contacts/lib/tasks-tasks-portlet.tcl	16 Oct 2005 12:45:38 -0000	1.2
@@ -1 +1,9 @@
-set portlet_layout [parameter::get -parameter "DefaultPortletLayout"]
\ No newline at end of file
+foreach optional_param {party_id query search_id tasks_interval page page_size page_flush_p tasks_orderby} {
+    if {![info exists $optional_param]} {
+	set $optional_param {}
+    }
+}
+
+set portlet_layout [parameter::get -parameter "DefaultPortletLayout"]
+set row_list {checkbox {} deleted_p {} priority {} title {} process_title {} date {} creation_user {}}
+set package_id [apm_package_id_from_key tasks]