Index: openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml	13 Apr 2006 12:15:30 -0000	1.34
+++ openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml	3 May 2006 05:56:37 -0000	1.35
@@ -62,6 +62,7 @@
   <msg key="file_invoice_copy">Invoice copy</msg>
   <msg key="file_invoice_credit">Credit</msg>
   <msg key="file_invoice_opening">Covering letter for invoice</msg>
+  <msg key="file_joined_invoice">invoices</msg>
   <msg key="file_offer">Offer</msg>
   <msg key="file_offer_accepted">Order confirmation</msg>
   <msg key="Final_Amount">Gross amount</msg>
@@ -77,6 +78,9 @@
   <msg key="Invoice">Invoice</msg>
   <msg key="Invoice_Cancel">Cancel</msg>
   <msg key="Invoice_count">Invoice count</msg>
+  <msg key="invoice_display">Display documents</msg>
+  <msg key="invoice_email">Email</msg>
+  <msg key="invoice_for_join">Mark for later download</msg>
   <msg key="Invoice_Item">Invoice Item</msg>
   <msg key="Invoice_item_number">Invoice item number</msg>
   <msg key="Invoice_Item_title">Invoice Item Title</msg>
@@ -218,6 +222,7 @@
   <msg key="iv_invoice_view">View Invoices</msg>
   <msg key="iv_invoices_email">&lt;html&gt;&lt;body&gt;&lt;h3&gt;Invoices&lt;/h3&gt;%contact.salutation%,&lt;p&gt;see attached invoices %invoice_nrs%.&lt;p&gt;Best wishes,&lt;br&gt;WIENERS + WIENERS GmbH&lt;br&gt;&lt;/html&gt;&lt;/body&gt;</msg>
   <msg key="iv_invoices_email_subject">Invoices # %invoice_nrs%</msg>
+  <msg key="iv_join_invoice">Load prepared invoices</msg>
   <msg key="iv_journal">Invoice journal</msg>
   <msg key="iv_journal_check">Export Journal</msg>
   <msg key="iv_of_month_year">Invoices of %long_month% %year%:</msg>
@@ -422,6 +427,8 @@
   <msg key="Rebate">Rebate</msg>
   <msg key="Received_on">Received on</msg>
   <msg key="Recipient">Recipient</msg>
+  <msg key="report_customer_type">Customer type</msg>
+  <msg key="report_new_customer">New customer</msg>
   <msg key="show_all_offer_projects">All projects</msg>
   <msg key="show_all_offers">All Offers</msg>
   <msg key="show_all_offers2">Show all offers</msg>
@@ -449,6 +456,7 @@
   <msg key="vat_number">VAT number</msg>
   <msg key="View_cancel">Cancellation</msg>
   <msg key="View_copy">Invoice copy</msg>
+  <msg key="View_credit">Credit</msg>
   <msg key="View_invoice">Send invoice</msg>
   <msg key="year">Year</msg>
   <msg key="yes">Yes</msg>
Index: openacs-4/packages/invoices/www/invoice-send.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-send.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/invoices/www/invoice-send.tcl	10 Apr 2006 11:26:01 -0000	1.17
+++ openacs-4/packages/invoices/www/invoice-send.tcl	3 May 2006 05:56:33 -0000	1.18
@@ -103,9 +103,6 @@
 	set file_size [file size $document_file]
 	set file_id [contact::oo::import_oo_pdf -oo_file $document_file -printer_name "pdfconv" -title $file_title -parent_id $invoice_id]
 
-	# set file_id [cr_import_content -title $file_title -description "PDF version of <a href=[export_vars -base "/invoices/invoice-ae" -url {{mode display} invoice_id}]>this invoice</a>" $invoice_id $document_file $file_size application/pdf "[clock seconds]-[expr round([ns_rand]*100000)]"]
-	# content::item::set_live_revision -revision_id $file_id
-
 	lappend file_ids $file_id
 #	db_dml set_publish_status {}
     }
@@ -139,11 +136,14 @@
 	    db_dml set_publish_status_and_parent {}
 	    db_dml set_context_id {}
 	}
+
+	# mark displayed pdf as sent
+	iv::invoice::set_pdf_status -invoice_id $invoice_id -status "sent"
+
 	if {$status == "new" || [empty_string_p $status]} {
 	    iv::invoice::set_status -invoice_id $invoice_id -status "billed"
 	}
     }
-    
 }
 
 set cancel_url [export_vars -base invoice-list {organization_id}]