Index: openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml	11 Oct 2005 15:23:28 -0000	1.6
+++ openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml	12 Oct 2005 13:25:34 -0000	1.7
@@ -9,7 +9,8 @@
   <msg key="Amount_sum">Betrag</msg>
   <msg key="Amount_total">Gesamtsumme</msg>
   <msg key="Apply_VAT">Mehrwertsteuer?</msg>
-  <msg key="back_to_project">Zurueck zum projekt</msg>
+  <msg key="back">Zur�ck</msg>
+  <msg key="back_to_project">Zur�ck zum projekt</msg>
   <msg key="back_to_year">Zur�ck zu %year%</msg>
   <msg key="back_to_years">Zur�ck zu den Jahren</msg>
   <msg key="Billable_Projects">Abzurechnende Projekte</msg>
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.6 -r1.7
--- openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml	11 Oct 2005 15:23:28 -0000	1.6
+++ openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml	12 Oct 2005 13:25:34 -0000	1.7
@@ -10,6 +10,7 @@
   <msg key="Amount_sum">Amount sum</msg>
   <msg key="Amount_total">Total Amount</msg>
   <msg key="Apply_VAT">Apply VAT?</msg>
+  <msg key="back">Back</msg>
   <msg key="back_to_project">Back to project</msg>
   <msg key="back_to_year">Back to %year%</msg>
   <msg key="back_to_years">Back to Years</msg>
Index: openacs-4/packages/invoices/lib/price-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/price-list.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/invoices/lib/price-list.tcl	6 Sep 2005 22:59:40 -0000	1.2
+++ openacs-4/packages/invoices/lib/price-list.tcl	12 Oct 2005 13:25:34 -0000	1.3
@@ -1,10 +1,25 @@
-set package_id [ad_conn package_id]
+if {![exists_and_not_null package_id]} {
+    set package_id [apm_package_id_from_key invoices]
+}
+if {![exists_and_not_null base_url]} {
+    set base_url [apm_package_url_from_id $package_id]
+}
+if {![info exists return_url]} {
+    set contacts_url [apm_package_url_from_key contacts]
+    set return_url $contacts_url
+    set return_url ""
+}
+
 set language [lang::conn::language]
 db_1row currency {}
 array set container_objects [iv::util::get_default_objects -package_id $package_id]
 
-set actions [list "[_ invoices.iv_price_Edit]" [export_vars -base "price-ae" {list_id}] "[_ invoices.iv_price_Edit]"]
+set actions [list "[_ invoices.iv_price_Edit]" [export_vars -base "${base_url}price-ae" {list_id}] "[_ invoices.iv_price_Edit]"]
 
+if {![empty_string_p $return_url]} {
+    lappend actions "[_ invoices.back]" $return_url "[_ invoices.back]"
+}
+
 template::list::create \
     -name iv_price \
     -key category_id \
Index: openacs-4/packages/invoices/www/price-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/price-list.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/invoices/www/price-list.adp	6 Sep 2005 23:01:24 -0000	1.2
+++ openacs-4/packages/invoices/www/price-list.adp	12 Oct 2005 13:25:34 -0000	1.3
@@ -1,7 +1,9 @@
-<master>
 <if @organization_id@ not nil>
+  <master src="@contact_master@">
   <property name="party_id">@organization_id@</property>
-</if>
+</if><else>
+  <master>
+</else>
 
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
Index: openacs-4/packages/invoices/www/price-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/price-list.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/invoices/www/price-list.tcl	6 Sep 2005 23:01:24 -0000	1.2
+++ openacs-4/packages/invoices/www/price-list.tcl	12 Oct 2005 13:25:34 -0000	1.3
@@ -12,6 +12,8 @@
 }
 
 set package_id [ad_conn package_id]
+set contact_package_id [apm_package_id_from_key contacts]
+set contact_master [parameter::get -parameter ContactMaster -package_id $contact_package_id]
 
 if {[empty_string_p $list_id]} {
     set list_id [iv::price_list::get_list_id -organization_id $organization_id -package_id $package_id]