Index: openacs-4/packages/invoices-portlet/lib/invoice-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/invoices-portlet/lib/invoice-list.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/invoices-portlet/lib/invoice-list.tcl 9 Sep 2005 16:28:23 -0000 1.2 +++ openacs-4/packages/invoices-portlet/lib/invoice-list.tcl 27 Oct 2005 19:35:38 -0000 1.3 @@ -56,6 +56,10 @@ label {[_ invoices.iv_invoice_paid_amount]} display_template {@iv_invoice.paid_amount@ @iv_invoice.paid_currency@} } + recipient { + label "[_ invoices.iv_invoice_recipient]" + display_template "@iv_invoice.recipient;noquote@" + } creation_user { label {[_ invoices.iv_invoice_creation_user]} display_template {@iv_invoice.first_names@ @iv_invoice.last_name@} @@ -92,7 +96,9 @@ } -db_multirow -extend {creator_link edit_link cancel_link delete_link} iv_invoice iv_invoice {} { +set contacts_p [apm_package_installed_p contacts] + +db_multirow -extend {creator_link edit_link cancel_link delete_link recipient} iv_invoice iv_invoice {} { # Ugly hack. We should find out which contact package is linked set creator_link "/contacts/$creation_user" set edit_link [export_vars -base "${base_url}/invoice-ae" {invoice_id}] @@ -105,4 +111,9 @@ if {![empty_string_p $paid_amount]} { set paid_amount [format "%.2f" $paid_amount] } + if { $contacts_p } { + set recipient "[contact::name -party_id $recipient_id]" + } else { + set recipient [person::name -person_id $recipient_id] + } }