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.5 -r1.6
--- openacs-4/packages/invoices/www/invoice-send.tcl	5 Oct 2005 16:17:57 -0000	1.5
+++ openacs-4/packages/invoices/www/invoice-send.tcl	11 Oct 2005 15:23:29 -0000	1.6
@@ -15,33 +15,47 @@
 set page_title "[_ invoices.iv_invoice_send]"
 
 db_1row invoice_data {}
+set locale [lang::user::site_wide_locale -user_id $recipient_id]
 
 set context [list [list [export_vars -base invoice-list {organization_id}] "[_ invoices.iv_invoice_2]"] [list [export_vars -base invoice-ae {invoice_id}] "[_ invoices.iv_invoice_View]"] $page_title]
 
-set invoice_text [iv::invoice::parse_data -invoice_id $invoice_id -recipient_id $recipient_id]
+if {$total_amount > 0} {
+    # send invoice
+    # set invoice_text "{[_ invoices.iv_invoice_email]}"
+    set subject [lang::util::localize "#invoices.iv_invoice_email_subject#" $locale]
+    set template "InvoiceTemplate"
+} elseif {[empty_string_p $parent_invoice_id]} {
+    # send credit
+    # set invoice_text "{[_ invoices.iv_invoice_credit_email]}"
+    set subject [lang::util::localize "#invoices.iv_invoice_credit_email_subject#" $locale]
+    set template "CreditTemplate"
+} else {
+    # send cancellation
+    # set invoice_text "{[_ invoices.iv_invoice_cancel_email]}"
+    set subject [lang::util::localize "#invoices.iv_invoice_cancel_email_subject#" $locale]
+    set template "CancelTemplate"
+}
 
+set invoice_text [iv::invoice::parse_data -invoice_id $invoice_id -recipient_id $recipient_id -template $template -locale $locale]
+
+set project_id [lindex [application_data_link::get_linked -from_object_id $invoice_id -to_object_type content_item] 0]
+if {![empty_string_p $project_id]} {
+    acs_object::get -object_id $project_id -array project
+    set pm_url [lindex [site_node::get_url_from_object_id -object_id $project(package_id)] 0]
+    set return_url [export_vars -base "${pm_url}one" {{project_item_id $project_id}}]
+} else {
+    set return_url [export_vars -base invoice-list {organization_id}]
+}
+
 if {[empty_string_p $file_ids]} {
     set pdf_file [text_templates::create_pdf_from_html -html_content "$invoice_text"]
     if {![empty_string_p $pdf_file]} {
 	set file_size [file size $pdf_file]
-	set root_folder_id [lindex [application_data_link::get_linked -from_object_id $organization_id -to_object_type content_folder] 0]
-	set invoice_folder_id [lindex [application_data_link::get_linked -from_object_id $root_folder_id -to_object_type content_folder] 0]
-
-	set file_ids [cr_import_content -title "Invoice $invoice_id" -description "PDF version of <a href=[export_vars -base "/invoices/invoice-ae" -url {{mode display} invoice_id}]>this offer</a>" $invoice_folder_id $pdf_file $file_size application/pdf "[clock seconds]-[expr round([ns_rand]*100000)]"]
-	application_data_link::new -this_object_id $invoice_id -target_object_id $file_ids
+	set file_ids [cr_import_content -title "Invoice_${invoice_id}.pdf" -description "PDF version of <a href=[export_vars -base "/invoices/invoice-ae" -url {{mode display} invoice_id}]>this offer</a>" $invoice_id $pdf_file $file_size application/pdf "[clock seconds]-[expr round([ns_rand]*100000)]"]]
+	set return_url [export_vars -base invoice-pdf {invoice_id {file_id $file_ids}}]
     }
 }
 
-if {$total_amount > 0} {
-    # send invoice
-    set invoice_text "{[_ invoices.iv_invoice_email]}"
-} elseif {[empty_string_p $parent_invoice_id]} {
-    # send credit
-    set invoice_text "{[_ invoices.iv_invoice_credit_email]}"
-} else {
-    # send cancellation
-    set invoice_text "{[_ invoices.iv_invoice_cancel_email]}"
-}
 
 set return_url [export_vars -base invoice-list {organization_id}]
 set party_ids [contact::util::get_employees -organization_id $organization_id]