Index: openacs-4/packages/contacts/www/contact.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.adp,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/contacts/www/contact.adp	21 Jun 2005 12:24:53 -0000	1.20
+++ openacs-4/packages/contacts/www/contact.adp	21 Jun 2005 20:51:34 -0000	1.21
@@ -34,19 +34,26 @@
       size="small"
       recent_on_top_p="1" />
     <if @pm_package_id@>
-	<h3 class="contact-title"><a href="@base_url@">#project-manager.Projects#</a></h3>
-            <include src=/packages/project-manager/lib/projects orderby=@orderby;noquote@    elements="customer_name  earliest_finish_date latest_finish_date actual_hours_completed category_id" package_id=@pm_package_id@ actions_p="1" bulk_p="1" assignee_id="" filter_p="0" base_url="@base_url@" customer_id="@party_id@" status_id="1">
+	<h3 class="contact-title"><a href="@pm_base_url@">#project-manager.Projects#</a></h3>
+            <include src=/packages/project-manager/lib/projects orderby=@orderby;noquote@    elements="customer_name  earliest_finish_date latest_finish_date actual_hours_completed category_id" package_id=@pm_package_id@ actions_p="1" bulk_p="1" assignee_id="" filter_p="0" base_url="@pm_base_url@" customer_id="@party_id@" status_id="1">
 </if>
     <if @projects_enabled_p@>
-    <if @project_url@ ne "">
-      <br />
-      <h3>
-	<a href="@project_url@">#contacts.PROJECT#</a>
-	<include
-	  src="/packages/project-manager/lib/subprojects"
-	  project_item_id="@project_id@"
-	  base_url="@base_url@" />
+      <if @project_url@ ne "">
+	<br />
+	<h3>
+	  <a href="@project_url@">#contacts.PROJECT#</a>
+	  <include
+	    src="/packages/project-manager/lib/subprojects"
+	    project_item_id="@project_id@"
+	    base_url="@base_url@" />
+      </if>
     </if>
+    <if @invoices_enabled_p@>
+      <h3 class="contact-title"><a href="/invoices">#invoices.Offers#</a></h3>
+      <include src="/packages/invoices/lib/offer-list" organization_id="@party_id@" elements="offer_nr title amount_total" package_id="@iv_package_id@" base_url="@iv_base_url@" />
+	
+      <h3 class="contact-title"><a href="/invoices">#invoices.Billable_Projects#</a></h3>
+      <include src="/packages/invoices/lib/projects-billable" organization_id="@party_id@" elements="project_id title amount_open" package_id="@iv_package_id@" base_url="@iv_base_url@" />
     </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.17 -r1.18
--- openacs-4/packages/contacts/www/contact.tcl	21 Jun 2005 12:24:53 -0000	1.17
+++ openacs-4/packages/contacts/www/contact.tcl	21 Jun 2005 20:51:34 -0000	1.18
@@ -49,9 +49,10 @@
 
     set project_id [lindex [application_data_link::get_linked -from_object_id $party_id -to_object_type "pm_project"] 0]
     set dotlrn_club_id [lindex [application_data_link::get_linked -from_object_id $party_id -to_object_type "dotlrn_club"] 0]
+
     if {$project_id > 0 && $dotlrn_club_id <1} {
-	set package_id [acs_object::get_element -object_id $project_id -element package_id]
-	set base_url [apm_package_url_from_id $package_id]
+	set pm_package_id [acs_object::get_element -object_id $project_id -element package_id]
+	set pm_base_url [apm_package_url_from_id $pm_package_id]
 	set project_url [export_vars -base $base_url {{project_item_id $project_id}}]
 	set projects_enabled_p 1
     } else {
@@ -63,13 +64,20 @@
 	set club_url [dotlrn_community::get_community_url $dotlrn_club_id]
 	set dotlrn_club_enabled_p 1
 	set pm_package_id [dotlrn_community::get_package_id_from_package_key -package_key "project-manager" -community_id $dotlrn_club_id]
-	set base_url [apm_package_url_from_id $pm_package_id]
+	set pm_base_url [apm_package_url_from_id $pm_package_id]
     } else {
 	set dotlrn_club_enabled_p 0
     }
+
+    set iv_package_id [application_link::get_linked -from_package_id [ad_conn package_id] -to_package_key "invoices"]
+    if {$iv_package_id > 0 } {
+	set iv_base_url [apm_package_url_from_id $iv_package_id]
+	set invoices_enabled_p 1
+    }
 } else {
     set dotlrn_club_enabled_p 0
     set projects_enabled_p 0
+    set invoices_enabled_p 0
 }