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.13 -r1.14
--- openacs-4/packages/invoices/www/invoice-ae.tcl	7 Nov 2005 15:54:00 -0000	1.13
+++ openacs-4/packages/invoices/www/invoice-ae.tcl	13 Nov 2005 09:54:31 -0000	1.14
@@ -24,7 +24,7 @@
 
 ####### FIXME ########
 # First try to find the organization_id
-if {[empty_string_p $organization_id] } {
+if {[empty_string_p $organization_id] && [exists_and_not_null project_id]} {
     set organisations [db_list organizations "select distinct customer_id from pm_projects where project_id in ([join $project_id ","])"]
     if {[llength $organisations] == 1} {
 	set organization_id [lindex $organisations 0]