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 -r1.43 -r1.44
--- openacs-4/packages/invoices/www/invoice-ae.tcl	6 Nov 2006 15:41:12 -0000	1.43
+++ openacs-4/packages/invoices/www/invoice-ae.tcl	8 Nov 2006 14:42:07 -0000	1.44
@@ -462,10 +462,14 @@
 
 
 ad_form -extend -name iv_invoice_form -new_request {
-    set opening_p 0
+    if {$recipient_id eq $contact_id} {
+	set opening_p 0
+    } else {
+	set opening_p 1
+    }
     set invoice_p 1
     set copy_p 0
-    set email_p j
+    set email_p f
 
     if {[exists_and_not_null project_id]} {
 	set description [lang::util::localize [join [db_list project_titles {}] ",\n"]]
@@ -722,11 +726,6 @@
 	}
     }
 
-    # Force opening if different recipient
-    if {![string eq $recipient_id $contact_id]} {
-	set opening_p 1
-    }
-
     if {[empty_string_p $return_url]} {
 	set return_url "/contacts/$organization_id/"
     }