Index: openacs-4/packages/contacts/www/contact.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.adp,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/contacts/www/contact.adp	4 Oct 2005 21:53:25 -0000	1.29
+++ openacs-4/packages/contacts/www/contact.adp	5 Oct 2005 18:42:57 -0000	1.30
@@ -48,6 +48,7 @@
 	<include src="/packages/invoices/lib/projects-billable" organization_id="@party_id@" elements="checkbox project_id title amount_open" package_id="@iv_package_id@" base_url="@iv_base_url@" />
 	<include src="/packages/glossar/lib/glossar-list" owner_id=@party_id@ orderby=@orderby@ customer_id=@party_id@ format=table></include>
       </if>
+      <if @pm_installed_p@>
 	<br>
 	<h3 class="contact-title">#contacts.Complaints#:</h3>
 	<include src="/packages/contacts/lib/contact-complaint-list" 
@@ -59,6 +60,16 @@
 	     <input type="hidden" name="customer_id" value="@party_id@">
 	     <input type="submit" value="#contacts.Add_1#">
 	</form>
+	<br>
+	<h3 class="contact-title">#contacts.Freelancers#:</h3>
+	<include src="/packages/project-manager/lib/customer-group-list" 
+	    customer_id=@party_id@
+	    group_name="Freelancer"
+	    elements="name project_name deadline"
+	    cgl_orderby=@cgl_orderby;noquote@
+	    page=@page@
+	>
+      </if>
     </if>
     <if @update_date@ not nil>
       <p class="last-updated">#contacts.Last_updated# @update_date@</p>
Index: openacs-4/packages/contacts/www/contact.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/contacts/www/contact.tcl	5 Oct 2005 13:00:52 -0000	1.25
+++ openacs-4/packages/contacts/www/contact.tcl	5 Oct 2005 18:42:57 -0000	1.26
@@ -8,6 +8,8 @@
 } {
     {party_id:integer,notnull}
     {orderby ""}
+    {cgl_orderby ""}
+    {page "1"}
 } -validate {
     contact_exists -requires {party_id} {
 	if { ![contact::exists_p -party_id $party_id] } {
@@ -80,13 +82,15 @@
     set invoices_enabled_p 0
 }
 
+# We check if the project-manager package is installed, otherwise the queries break
+set pm_installed_p [apm_package_enabled_p "project-manager"]
 
-if {$object_type == "organization"} {
+if { $object_type == "organization" && $pm_installed_p} {
     # We are going to get a list of all members of the group Freelancer
     # that have worked in a project for customer_id (party_id in this case).
     # So first we get all projects were the party_id is customer
     
-    set project_list [db_list get_projects { select item_id from pm_projectsx where customer_id = :party_id }]
+    set project_list [db_list get_projects { }]
     
     if {![empty_string_p $project_list]} {
 	# Now we search for all the members of the Freelancer
Index: openacs-4/packages/contacts/www/contact.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/contact.xql	4 Oct 2005 21:53:25 -0000	1.1
+++ openacs-4/packages/contacts/www/contact.xql	5 Oct 2005 18:42:57 -0000	1.2
@@ -1,6 +1,17 @@
 <?xml version="1.0"?>
 <queryset>
 
+<fullquery name="get_projects">
+    <querytext>
+	select 
+		item_id 
+	from 
+		pm_projectsx 
+	where 
+		customer_id = :party_id 
+    </querytext>
+</fullquery>
+
 <fullquery name="get_members">
     <querytext>
 	select