Index: openacs-4/packages/invoices/www/price-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/price-ae.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/invoices/www/price-ae.tcl	16 Aug 2005 20:04:34 -0000	1.1
+++ openacs-4/packages/invoices/www/price-ae.tcl	9 Dec 2005 18:25:01 -0000	1.2
@@ -6,6 +6,7 @@
 } {
     amounts:float,array,optional
     {list_id:notnull}
+    {organization_id ""}
     {__new_p 0}
     {mode edit}
 } -properties {
@@ -94,9 +95,10 @@
 					  -amount $amounts($category_id) ]
 	    }
 	}
+	
     }
 } -after_submit {
-    ad_returnredirect [export_vars -base price-list {list_id}]
+    ad_returnredirect [export_vars -base price-list {list_id organization_id}]
     ad_script_abort
 }
 
Index: openacs-4/packages/invoices/www/price-list-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/price-list-ae.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/invoices/www/price-list-ae.tcl	11 Oct 2005 15:23:29 -0000	1.2
+++ openacs-4/packages/invoices/www/price-list-ae.tcl	9 Dec 2005 18:25:01 -0000	1.3
@@ -7,6 +7,7 @@
     list_id:integer,optional
     {__new_p 0}
     {mode edit}
+    {organization_id ""}
 } -properties {
     context:onevalue
     page_title:onevalue
@@ -34,7 +35,7 @@
 array set container_objects [iv::util::get_default_objects -package_id $package_id]
 
 set language [lang::conn::language]
-set organization_options [db_list_of_lists organization_list {}]
+
 set currency_options [db_list_of_lists currencies {}]
 
 ad_form -name iv_price_list_form -action price-list-ae -mode $mode -has_submit $has_submit -form {
@@ -50,14 +51,25 @@
     category::ad_form::add_widgets -container_object_id $container_objects(list_id) -categorized_object_id $_list_id -form_name iv_price_list_form
 }
 
+if {[string eq "" $organization_id]} {
+    set organization_options [db_list_of_lists organization_list {}]
+    ad_form -extend -name iv_price_list_form -form {
+	{organization_id:text(multiselect),optional,multiple {label "[_ invoices.iv_price_list_organization]"} {options $organization_options} {help_text "[_ invoices.iv_price_list_organization_help]"} {values {$organization_values}}}
+    }
+} else {
+    set organization_name [contact::name -party_id $organization_id]
+    ad_form -extend -name iv_price_list_form -form {
+	{organization_name:text(inform) {label "[_ invoices.iv_price_list_organization]"} {value $organization_name } {help_text "[_ invoices.iv_price_list_organization_help]"} }
+	{organization_id:text(hidden)}
+    }
+}
+
 ad_form -extend -name iv_price_list_form -form {
-    {organization_id:text(multiselect),optional,multiple {label "[_ invoices.iv_price_list_organization]"} {options $organization_options} {help_text "[_ invoices.iv_price_list_organization_help]"} {values {$organization_values}}}
     {currency:text(select) {label "[_ invoices.iv_price_list_currency]"} {options $currency_options} {help_text "[_ invoices.iv_price_list_currency_help]"}}
     {credit_percent:float {label "[_ invoices.iv_price_list_credit_percent]"} {html {size 5 maxlength 10}} {help_text "[_ invoices.iv_price_list_credit_percent_help]"} {after_html {%}}}
 } -new_request {
     set title ""
     set description ""
-    set organization_id ""
     set currency [parameter::get -parameter "DefaultCurrency" -default "EUR"]
     set credit_percent 0
 } -edit_request {
@@ -96,6 +108,7 @@
 
 	application_data_link::delete_links -object_id $new_list_id
 	foreach o_id $organization_id {
+	    set package_id [ad_conn package_id]
 	    application_data_link::new -this_object_id $new_list_id -target_object_id $o_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.5 -r1.6
--- openacs-4/packages/invoices/www/price-list.adp	26 Oct 2005 14:54:18 -0000	1.5
+++ openacs-4/packages/invoices/www/price-list.adp	9 Dec 2005 18:25:01 -0000	1.6
@@ -13,7 +13,12 @@
    <td>
 	<include src="/packages/invoices/lib/price-list" 
 		list_id="@list_id@" 
+		organization_id="@organization_id@"
 		page_title="@list_title;noquote@" />
    </td>
 </tr>
 </table>
+<p>
+<if @organization_id@ ne "">
+<a href="price-list-ae?organization_id=@organization_id@">#invoices.Create_new_pricelist_for_customer#</a>
+</if>
\ No newline at end of file