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.25 -r1.26
--- openacs-4/packages/invoices/www/invoice-ae.tcl	30 Jan 2006 12:50:39 -0000	1.25
+++ openacs-4/packages/invoices/www/invoice-ae.tcl	31 Jan 2006 11:35:21 -0000	1.26
@@ -147,11 +147,13 @@
     # The other query would show all of them.
     set contact_options [db_list_of_lists contacts {}]
     set recipient_options [db_list_of_lists recipients {}]
-    set rec_organization_id [contact::util::get_employee_organization -employee_id [lindex [lindex $recipient_options 0] 1]]
-    lappend recipient_options [list [organizations::name -organization_id $rec_organization_id] $rec_organization_id]
 }
 
+# Get the recipient_organization_id
+set rec_organization_id [contact::util::get_employee_organization -employee_id [lindex [lindex $recipient_options 0] 1]]
+lappend recipient_options [list [organizations::name -organization_id $rec_organization_id] $rec_organization_id]
 
+
 ad_form -name iv_invoice_form -action invoice-ae -mode $mode -has_submit $has_submit -has_edit $has_edit -export {organization_id project_id} -form {
     {invoice_id:key}
     {organization_name:text(inform) {label "[_ invoices.iv_invoice_organization]"} {value $organization_name} {help_text "[_ invoices.iv_invoice_organization_help]"}}
@@ -366,7 +368,7 @@
 				    -contact_id $contact_id \
 				    -recipient_id $recipient_id \
 				    -invoice_nr $invoice_nr \
-				    -organization_id $organization_id \
+				    -organization_id $rec_organization_id \
 				    -total_amount $total_amount \
 				    -amount_sum $amount_sum \
 				    -currency $currency \
@@ -428,7 +430,7 @@
 				    -contact_id $contact_id \
 				    -recipient_id $recipient_id \
 				    -invoice_nr $invoice_nr \
-				    -organization_id $organization_id \
+				    -organization_id $rec_organization_id \
 				    -total_amount $total_amount \
 				    -amount_sum $amount_sum \
 				    -currency $currency \