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 -r1.5 -r1.6
--- openacs-4/packages/invoices/www/invoice-send-1.tcl	3 May 2006 05:52:35 -0000	1.5
+++ openacs-4/packages/invoices/www/invoice-send-1.tcl	27 Oct 2006 17:06:33 -0000	1.6
@@ -26,7 +26,7 @@
 
 # warn if invoice already got sent
 set sent_p 0
-if {![empty_string_p $invoice_nr]} {
+if {$status eq "billed"} {
     set sent_p 1
 }
 
@@ -36,9 +36,9 @@
 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]
-}
+#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}
Index: openacs-4/packages/invoices/www/invoice-send-1.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-send-1.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/invoices/www/invoice-send-1.xql	3 May 2006 05:52:35 -0000	1.3
+++ openacs-4/packages/invoices/www/invoice-send-1.xql	27 Oct 2006 17:06:33 -0000	1.4
@@ -5,7 +5,7 @@
       <querytext>
 
     select i.invoice_nr, i.organization_id, i.parent_invoice_id, i.invoice_nr,
-           i.total_amount, i.recipient_id, i.contact_id, i.pdf_status
+           i.total_amount, i.recipient_id, i.contact_id, i.pdf_status, i.status
     from iv_invoices i, cr_items ii
     where ii.latest_revision = i.invoice_id
     and ii.item_id = :invoice_id