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.31 -r1.32
--- openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml	7 Apr 2006 13:52:19 -0000	1.31
+++ openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml	10 Apr 2006 06:21:57 -0000	1.32
@@ -326,6 +326,7 @@
   <msg key="iv_offer_reservation_help">Offer reservation that will appear only on offer.</msg>
   <msg key="iv_offer_send">Send Offer</msg>
   <msg key="iv_offer_send_accepted">Send confirmation</msg>
+  <msg key="iv_offer_send_again">Send offer again</msg>
   <msg key="iv_offer_subproject_finish_date_help">Interne Deadline des Subprojektes</msg>
   <msg key="iv_offer_template">Template des Angebots</msg>
   <msg key="iv_offer_Title">Title</msg>
Index: openacs-4/packages/invoices/www/invoice-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-ae.tcl,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/invoices/www/invoice-ae.tcl	2 Apr 2006 22:08:02 -0000	1.28
+++ openacs-4/packages/invoices/www/invoice-ae.tcl	10 Apr 2006 06:21:58 -0000	1.29
@@ -124,7 +124,7 @@
     set invoice_specialities ""
 }
 
-set context [list [list "invoice-list" "[_ invoices.iv_invoice_2]"] [list [export_vars -base invoice-add {organization_id}] "[_ invoices.iv_invoice_Add]"] $page_title]
+set context [list [list "invoice-list" "[_ invoices.iv_invoice_2]"] [list [export_vars -base invoice-list {organization_id}] "[_ invoices.iv_invoice_Add]"] $page_title]
 array set container_objects [iv::util::get_default_objects -package_id $package_id]
 set timestamp_format "$date_format [lc_get formbuilder_time_format]"
 
Index: openacs-4/packages/invoices/www/offer-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/offer-ae.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/invoices/www/offer-ae.tcl	7 Apr 2006 13:46:37 -0000	1.23
+++ openacs-4/packages/invoices/www/offer-ae.tcl	10 Apr 2006 06:21:58 -0000	1.24
@@ -74,7 +74,7 @@
     set cur_vat_percent [format "%.1f" $cur_vat_percent]
     if {$mode == "edit"} {
 	db_1row check_invoices {}
-	if {$invoice_count>0 && ![info exists send]} {
+	if {$invoice_count>0 && ![info exists send] && ![info exists send_accepted]} {
 	    # do not allow to edit an invoiced offer
 	    ad_return_complaint 1 "[_ invoices.iv_offer_edit_error]"
 	}
@@ -98,7 +98,7 @@
     ad_script_abort
 }
 if {[info exists send]} {
-    ad_returnredirect [export_vars -base offer-send {organization_id offer_id return_url}]
+    ad_returnredirect [export_vars -base offer-send {organization_id offer_id return_url {type offer}}]
     ad_script_abort
 }
 if {[info exists send_accepted]} {
@@ -555,6 +555,7 @@
 	}
     } else {
 	ad_form -extend -name iv_offer_form -form {
+	    {send:text(submit) {label "[_ invoices.iv_offer_send_again]"} {value t}}
 	    {send_accepted:text(submit) {label "[_ invoices.iv_offer_send_accepted]"} {value t}}
 	}
     }
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.19 -r1.20
--- openacs-4/packages/invoices/www/offer-send.tcl	7 Apr 2006 13:46:37 -0000	1.19
+++ openacs-4/packages/invoices/www/offer-send.tcl	10 Apr 2006 06:21:58 -0000	1.20
@@ -6,6 +6,7 @@
 } {
     offer_id:integer
     {return_url ""}
+    {type ""}
 } -properties {
     context:onevalue
     page_title:onevalue
@@ -30,7 +31,7 @@
 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]} {
+if {[empty_string_p $accepted_date] || $type == "offer"} {
     # send pending offer
     set offer_text "#invoices.iv_offer_email#"
     set subject [lang::util::localize "#invoices.iv_offer_email_subject#" $locale]