Index: openacs-4/packages/invoices-portlet/lib/projects-billable.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/invoices-portlet/lib/projects-billable.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/invoices-portlet/lib/projects-billable.tcl 28 Oct 2005 18:16:49 -0000 1.5 +++ openacs-4/packages/invoices-portlet/lib/projects-billable.tcl 2 Nov 2005 15:18:27 -0000 1.6 @@ -41,7 +41,6 @@ set t_closed_id [pm::task::default_status_closed] set date_format [lc_get formbuilder_date_format] set timestamp_format "$date_format [lc_get formbuilder_time_format]" -set currency [iv::price_list::get_currency -organization_id $organization_id] set contacts_p [apm_package_installed_p contacts] if { $contacts_p } { @@ -116,6 +115,7 @@ set amount_open [format "%.2f" $amount_open] set dotlrn_club_id [lindex [application_data_link::get_linked -from_object_id $organization_id -to_object_type "dotlrn_club"] 0] set pm_base_url [apm_package_url_from_id [dotlrn_community::get_package_id_from_package_key -package_key "project-manager" -community_id $dotlrn_club_id]] + set currency [iv::price_list::get_currency -organization_id $organization_id] set project_link [export_vars -base "${pm_base_url}one" {{project_item_id $project_id}}] set currency [iv::price_list::get_currency -organization_id $organization_id] if { $contacts_p } { Index: openacs-4/packages/invoices-portlet/www/invoices-offers-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/invoices-portlet/www/invoices-offers-portlet.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/invoices-portlet/www/invoices-offers-portlet.tcl 26 Oct 2005 22:45:11 -0000 1.2 +++ openacs-4/packages/invoices-portlet/www/invoices-offers-portlet.tcl 2 Nov 2005 15:18:27 -0000 1.3 @@ -6,7 +6,6 @@ set user_id [ad_conn user_id] set community_id [dotlrn_community::get_community_id_from_url] set package_id [apm_package_id_from_key invoices] -set organization_id [lindex [application_data_link::get_linked -from_object_id $community_id -to_object_type "organization"] 0] if {[empty_string_p $community_id]} { @@ -22,10 +21,12 @@ lappend project_manager_ids $node_info(package_id) } + set organization_id "" } else { set node "[site_node::get -url "[dotlrn_community::get_community_url $community_id]project-manager" ]" + set organization_id [lindex [application_data_link::get_linked -from_object_id $community_id -to_object_type "organization"] 0] array set node_info $node