Index: openacs-4/packages/invoices/www/invoice-send-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-send-1.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/invoices/www/invoice-send-1.tcl	2 Apr 2006 22:08:02 -0000	1.4
+++ openacs-4/packages/invoices/www/invoice-send-1.tcl	3 May 2006 05:52:35 -0000	1.5
@@ -34,7 +34,12 @@
 set invoice_copy [ams::value -attribute_name "invoice_copy" -object_id $rec_orga_revision_id]
 
 set boolean_options [list [list "[_ invoices.yes]" 1] [list "[_ invoices.no]" 0]]
+set email_options [list [list "[_ invoices.invoice_email]" t] [list "[_ invoices.invoice_display]" f]]
 
+if {$pdf_status != "sent"} {
+    lappend email_options  [list "[_ invoices.invoice_for_join]" j]
+}
+
 ad_form -name invoice_send -action invoice-send-1 -export {return_url} -form {
     {invoice_id:key}
 }
@@ -48,11 +53,17 @@
 ad_form -extend -name invoice_send -form {
     {invoice_p:text(radio) {label "[_ invoices.iv_invoice_p]"} {options $boolean_options}}
     {copy_p:text(radio) {label "[_ invoices.iv_invoice_copy_p]"} {options $boolean_options}}
-    {email_p:text(radio) {label "[_ invoices.iv_invoice_email_p]"} {options $boolean_options}}
+    {email_p:text(radio) {label "[_ invoices.iv_invoice_email_p]"} {options $email_options}}
 } -edit_request {
     set opening_p 0
     set invoice_p 1
-    set email_p 0
+
+    if {$pdf_status != "sent"} {
+	set email_p j
+    } else {
+	set email_p f
+    }
+
     set copy_p [ad_decode $invoice_copy t 1 0]
     if {[empty_string_p $copy_p]} {
 	set copy_p 0
@@ -63,11 +74,12 @@
 	set copy_p 1
     }
 } -after_submit {
-    if {$email_p} {
-	ad_returnredirect [export_vars -base "invoice-send" {invoice_id opening_p invoice_p copy_p return_url}]
-    } else {
-	ad_returnredirect [export_vars -base "invoice-documents" {invoice_id opening_p invoice_p copy_p return_url}]
+    switch $email_p {
+	t { ad_returnredirect [export_vars -base "invoice-send" {invoice_id opening_p invoice_p copy_p return_url}] }
+	f { ad_returnredirect [export_vars -base "invoice-documents" {invoice_id opening_p invoice_p copy_p return_url}] }
+	j { ad_returnredirect [export_vars -base "invoice-documents" {invoice_id opening_p invoice_p copy_p {display_p 0} return_url}] }
     }
+	
     ad_script_abort
 }