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.5 -r1.6
--- openacs-4/packages/invoices/www/offer-accept-2.tcl	14 Oct 2005 06:25:03 -0000	1.5
+++ openacs-4/packages/invoices/www/offer-accept-2.tcl	24 Oct 2005 12:21:35 -0000	1.6
@@ -6,6 +6,7 @@
 } {
     offer_id:integer
     {file_ids ""}
+    {return_url ""}
 } -properties {
     context:onevalue
     page_title:onevalue
@@ -41,8 +42,11 @@
 }
 
 set cancel_url [export_vars -base offer-list {organization_id}]
-set invoice_url [site_node::get_package_url -package_key invoices]
-set return_url [export_vars -base "${invoice_url}offer-ae" {offer_id {mode display}}]
+
+if {[empty_string_p $return_url]} {
+    set invoice_url [site_node::get_package_url -package_key invoices]
+    set return_url [export_vars -base "${invoice_url}offer-ae" {offer_id {mode display}}]
+}
 set extra_data [list offer_id $offer_id]
 
 ad_return_template
Index: openacs-4/packages/invoices/www/offer-accept.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/offer-accept.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/invoices/www/offer-accept.tcl	6 Sep 2005 23:01:24 -0000	1.2
+++ openacs-4/packages/invoices/www/offer-accept.tcl	24 Oct 2005 12:21:35 -0000	1.3
@@ -5,6 +5,7 @@
     @creation-date 2005-06-21
 } {
     offer_id
+    {return_url ""}
 } -properties {
     context:onevalue
     page_title:onevalue
@@ -15,7 +16,7 @@
 set context [list [list "offer-list" "[_ invoices.iv_offer_2]"] $page_title]
 
 set confirm_options [list [list "[_ invoices.continue_with_accept]" t] [list "[_ invoices.cancel_and_return]" f]]
-set return_url [export_vars -base offer-accept-2 {offer_id}]
+set accept_2_url [export_vars -base offer-accept-2 {offer_id return_url}]
 
 ad_form -name accept_confirm -action offer-accept -form {
     {offer_id:key}
@@ -31,7 +32,7 @@
     }
 } -after_submit {
     if {$confirmation} {
-	ad_returnredirect $return_url
+	ad_returnredirect $accept_2_url
 	ad_script_abort
     } else {
 	ad_returnredirect [export_vars -base offer-ae {offer_id {mode display}}]
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.3 -r1.4
--- openacs-4/packages/invoices/www/offer-ae.tcl	14 Oct 2005 06:25:03 -0000	1.3
+++ openacs-4/packages/invoices/www/offer-ae.tcl	24 Oct 2005 12:21:35 -0000	1.4
@@ -24,7 +24,7 @@
     {send_accepted:optional}
     {to_project:optional}
     {project_id:optional}
-    {return_url:optional ""}
+    {return_url ""}
 } -properties {
     context:onevalue
     page_title:onevalue
@@ -75,15 +75,15 @@
 }
 
 if {[info exists accept]} {
-    ad_returnredirect [export_vars -base offer-accept {organization_id offer_id}]
+    ad_returnredirect [export_vars -base offer-accept {organization_id offer_id return_url}]
     ad_script_abort
 }
 if {[info exists send]} {
-    ad_returnredirect [export_vars -base offer-send {organization_id offer_id}]
+    ad_returnredirect [export_vars -base offer-send {organization_id offer_id return_url}]
     ad_script_abort
 }
 if {[info exists send_accepted]} {
-    ad_returnredirect [export_vars -base offer-accept-2 {offer_id}]
+    ad_returnredirect [export_vars -base offer-accept-2 {offer_id return_url}]
     ad_script_abort
 }
 if {[info exists to_project]} {