Index: openacs-4/packages/invoices/lib/invoice-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/invoice-list.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/invoices/lib/invoice-list.tcl 9 Dec 2005 18:26:33 -0000 1.7 +++ openacs-4/packages/invoices/lib/invoice-list.tcl 14 Dec 2005 17:41:16 -0000 1.8 @@ -49,6 +49,9 @@ } } +# If the sum was paid, the total_amount should appear green. +# If it was billed, yet not paid, the total amount is red. Otherwise don't bother + template::list::create \ -name iv_invoice \ -key invoice_id \ @@ -169,7 +172,7 @@ db_multirow -extend {creator_link edit_link cancel_link delete_link recipient organization_id} 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}] set cancel_link [export_vars -base "${base_url}invoice-cancellation" {organization_id {parent_id $invoice_rev_id}}] set delete_link [export_vars -base "${base_url}invoice-delete" {invoice_id}] @@ -180,9 +183,10 @@ if {![empty_string_p $paid_amount]} { set paid_amount [format "%.2f" $paid_amount] } - #new,cancelled,billed,paid + if { $contacts_p } { set recipient "[contact::name -party_id $recipient_id]" + set creator_link "[contact::url -party_id $creation_user]" } else { set recipient [person::name -person_id $recipient_id] }