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 -N -r1.14 -r1.15 --- openacs-4/packages/invoices/lib/invoice-list.tcl 2 May 2006 12:07:11 -0000 1.14 +++ openacs-4/packages/invoices/lib/invoice-list.tcl 3 May 2006 05:52:35 -0000 1.15 @@ -49,7 +49,7 @@ set user_id [ad_conn user_id] set timestamp_format "YYYY-MM-DD HH24:MI:SS" -set bulk_actions [list "[_ invoices.iv_invoice_send]" "${base_url}invoices-view" "[_ invoices.iv_invoice_send]" "[_ invoices.iv_invoice_pay]" "${base_url}invoice-pay" "[_ invoices.iv_invoice_pay]"] +set bulk_actions [list "[_ invoices.iv_invoice_pay]" "${base_url}invoice-pay" "[_ invoices.iv_invoice_pay]"] set invoice_cancel_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege invoice_cancel] set return_url [ad_return_url] @@ -67,7 +67,7 @@ lappend actions "[_ invoices.iv_invoice_url]" $base_url "[_ invoices.iv_invoice_url2]" if {$invoice_cancel_p} { - lappend actions "[_ invoices.iv_journal_check]" "${base_url}journal-check" "[_ invoices.iv_journal_check]" + lappend actions "[_ invoices.iv_journal_check]" "${base_url}journal-check" "[_ invoices.iv_journal_check]" "[_ invoices.iv_join_invoice]" "${base_url}invoice-join" "[_ invoices.iv_join_invoice]" } # If the sum was paid, the total_amount should appear green.