Index: openacs-4/packages/invoices/www/offer-accept-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/offer-accept-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/invoices/www/offer-accept-2.tcl	8 Sep 2005 18:30:50 -0000	1.3
+++ openacs-4/packages/invoices/www/offer-accept-2.tcl	11 Oct 2005 15:23:29 -0000	1.4
@@ -20,24 +20,22 @@
 set project_id [lindex [application_data_link::get_linked -from_object_id $offer_id -to_object_type content_item] 0]
 
 db_1row project_data {}
+set locale [lang::user::site_wide_locale -user_id $contact_id]
 
 set context [list [list [export_vars -base offer-list {organization_id}] "[_ invoices.iv_offer_2]"] [list [export_vars -base offer-ae {offer_id}] "[_ invoices.iv_offer_View]"] $page_title]
 
-# set offer_text [iv::offer::text -offer_id $offer_id]
+set subject [lang::util::localize "#invoices.iv_offer_accepted_email_subject#" $locale]
+set template "OfferAcceptedTemplate"
+set offer_text [iv::offer::parse_data -offer_id $offer_id -recipient_id $contact_id -template $template -locale $locale]
 
-set offer_text [iv::offer::parse_data -offer_id $offer_id -recipient_id [lindex $party_ids 0]]
-
 if {[empty_string_p $file_ids]} {
     set pdf_file [text_templates::create_pdf_from_html -html_content "$offer_text"]
     if {![empty_string_p $pdf_file]} {
 	set file_size [file size $pdf_file]
-	set file_ids [cr_import_content -title "Offer $offer_id" -description "PDF version of <a href=[export_vars -base "/invoices/offer-ae" -url {{mode display} organization_id}]>this offer</a>" $offer_id $pdf_file $file_size application/pdf "Offer $offer_id"]
+	set file_ids [cr_import_content -title "Accepted_Offer_${offer_id}.pdf" -description "PDF version of <a href=[export_vars -base "/invoices/offer-ae" -url {{mode display} offer_id}]>this offer</a>" $offer_id $pdf_file $file_size application/pdf "[clock seconds]-[expr round([ns_rand]*100000)]"]
     }
 }
 
-set offer_text "{[_ invoices.iv_offer_accepted_email]}"
-
-
 set parties_new [list]
 foreach party_id $party_ids {