Index: openacs-4/packages/contacts/lib/contact-complaint-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-complaint-form.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/contacts/lib/contact-complaint-form.tcl	14 Oct 2005 23:02:42 -0000	1.12
+++ openacs-4/packages/contacts/lib/contact-complaint-form.tcl	16 Oct 2005 12:43:54 -0000	1.13
@@ -46,7 +46,8 @@
     # We get all the employees of this customer_id
     set emp_options [list]
     lappend emp_options [list "- - - - - -" ""]
-    db_foreach get_employees { } {
+    set employee_list [contact::util::get_employees -organization_id $customer_id]
+    foreach employee_id $employee_list {
 	set emp_name [contact::name -party_id $emp_id]
 	append emp_name " ([contact::email -party_id $emp_id])"
 	lappend emp_options [list $emp_name $emp_id]
Index: openacs-4/packages/contacts/lib/contact-complaint-list-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-complaint-list-portlet.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/contact-complaint-list-portlet.adp	12 Oct 2005 22:39:08 -0000	1.1
+++ openacs-4/packages/contacts/lib/contact-complaint-list-portlet.adp	16 Oct 2005 12:43:54 -0000	1.2
@@ -7,21 +7,19 @@
     <table border="0" cellpadding="1" cellspacing="1" width="100%">
       <tr>
         <td>
+	<if @customer_id@ ne "">
            <include src="/packages/contacts/lib/contact-complaint-list"
 	       customer_id="@customer_id@"
                elements="@elements@" />
+	</if><else>
+	<if @supplier_id@ ne "">
+           <include src="/packages/contacts/lib/contact-complaint-list"
+	       supplier_id="@supplier_id@"
+               elements="@elements@" />
+	</if>
+	</else>
         </td>
       </tr>
-      <tr>
-        <td>
-        <form action="/contacts/add-edit-complaint">
-        #contacts.Add_complaint_to#: @select_menu;noquote@
-             <input type="hidden" name="customer_id" value="@customer_id@">
-             <input type="submit" value="#contacts.Add_1#">
-        </form>
-	<br />
-        </td>
-      </tr> 
     </table>
   </td>
 </tr>
Index: openacs-4/packages/contacts/lib/contact-complaint-list-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-complaint-list-portlet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/contact-complaint-list-portlet.tcl	12 Oct 2005 22:39:08 -0000	1.1
+++ openacs-4/packages/contacts/lib/contact-complaint-list-portlet.tcl	16 Oct 2005 12:43:54 -0000	1.2
@@ -1 +1,8 @@
+set optional_param_list [list customer_id supplier_id]
+foreach optional_param $optional_param_list {
+    if {![info exists $optional_param]} {
+	set $optional_param {}
+    }
+}
+
 set portlet_layout [parameter::get -parameter "DefaultPortletLayout"]
\ No newline at end of file
Index: openacs-4/packages/contacts/lib/contact-complaint-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-complaint-list.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/contacts/lib/contact-complaint-list.tcl	5 Oct 2005 22:16:16 -0000	1.9
+++ openacs-4/packages/contacts/lib/contact-complaint-list.tcl	16 Oct 2005 12:43:54 -0000	1.10
@@ -54,7 +54,9 @@
 		  turnover [list label [_ contacts.Turnover]]\
 		  percent [list label [_ contacts.Percent]]\
 		  state [list label "[_ contacts.Status]:"]\
-		  complaint_object_id [list label [_ contacts.Object_id]]\
+		  complaint_object_id [list label [_ contacts.Object_id] \
+					  display_template \
+					  "<a href=\"@complaint.object_url@\">@complaint.complaint_object_id@</a>"]\
 		  description [list label [_ contacts.Description]]\
 		 ]
 
@@ -102,9 +104,10 @@
     }
 
 
-db_multirow -extend { customer customer_url supplier supplier_url } complaint get_complaints { } {
+db_multirow -extend { customer customer_url supplier supplier_url object_url} complaint get_complaints { } {
     set customer "[contact::name -party_id $customer_id]"
     set supplier "[contact::name -party_id $supplier_id]"
     set customer_url "/contacts/$customer_id"
     set supplier_url "/contacts/$supplier_id"
+    set object_url "/o/$complaint_object_id"
 }