Index: openacs-4/packages/invoices/www/offer-send.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/offer-send.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/invoices/www/offer-send.tcl	5 Oct 2005 16:17:57 -0000	1.5
+++ openacs-4/packages/invoices/www/offer-send.tcl	11 Oct 2005 15:23:29 -0000	1.6
@@ -14,26 +14,34 @@
 set page_title "[_ invoices.iv_offer_send]"
 
 db_1row offer_data {}
+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 x [iv::util::get_x_field -offer_id $offer_rev_id]
 set accept_link [export_vars -base "[ad_url][ad_conn package_url]offer-accepted" {x {offer_id $offer_rev_id}}]
 content::item::set_live_revision -revision_id $offer_rev_id
 
 if {[empty_string_p $accepted_date]} {
     # send pending offer
-    set offer_text "{[_ invoices.iv_offer_email]}"
+    # set offer_text "{[_ invoices.iv_offer_email]}"
+    set subject [lang::util::localize "#invoices.iv_offer_email_subject#" $locale]
+    set template "OfferTemplate"
 } else {
     # send accepted offer
-    set offer_text "{[_ invoices.iv_offer_accepted_email]}"
+    # set offer_text "{[_ invoices.iv_offer_accepted_email]}"
+    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 -accept_link $accept_link]
+
 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} offer_id}]>this offer</a>" $offer_id $pdf_file $file_size application/pdf "[clock seconds]-[expr round([ns_rand]*100000)]"]
+    set file_ids [cr_import_content -title "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)]"]
 } else {
     set file_ids ""
 }
@@ -48,7 +56,6 @@
 }
 
 set party_ids [contact::util::get_employees -organization_id $organization_id]
-set file_ids [concat $file_ids [db_string get_files {} -default ""]]
 set parties_new [list]
 foreach party_id $party_ids {