Index: openacs-4/packages/invoices/www/invoice-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-ae.tcl,v
diff -u -N -r1.30 -r1.31
--- openacs-4/packages/invoices/www/invoice-ae.tcl	2 May 2006 12:07:11 -0000	1.30
+++ openacs-4/packages/invoices/www/invoice-ae.tcl	4 May 2006 14:36:43 -0000	1.31
@@ -297,6 +297,16 @@
 	    }
 	}
     }
+
+    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] [list "[_ invoices.invoice_for_join]" j]]
+
+    ad_form -extend -name iv_invoice_form -form {
+	{opening_p:text(radio) {label "[_ invoices.iv_invoice_opening_p]"} {options $boolean_options}}
+	{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 $email_options}}
+    }
 }
 
 if {!$_invoice_id} {
@@ -444,6 +454,11 @@
 
 
 ad_form -extend -name iv_invoice_form -new_request {
+    set opening_p 0
+    set invoice_p 1
+    set copy_p 0
+    set email_p j
+
     set description [lang::util::localize [join [db_list project_titles {}] ",\n"]]
     set due_date [db_string today {}]
     set title "[_ invoices.iv_invoice_1] $organization_name $due_date"
@@ -652,10 +667,15 @@
     }
 
     if {[empty_string_p $return_url]} {
-	ad_returnredirect "/contacts/$organization_id/"
-    } else {
-	ad_returnredirect $return_url
+	set return_url "/contacts/$organization_id/"
     }
+
+    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
 }