Index: openacs-4/packages/invoices/lib/report-month.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/report-month.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/invoices/lib/report-month.tcl	6 Sep 2005 23:00:14 -0000	1.1
+++ openacs-4/packages/invoices/lib/report-month.tcl	7 Sep 2005 18:28:24 -0000	1.2
@@ -32,6 +32,11 @@
     }
 }
 
+set extra_query ""
+if { [empty_string_p $organization_id] } {
+    set exrta_query "and iv.organization_id = $organization_id"
+}
+
 set actions [list "[_ invoices.back_to_years]" \
 		 [export_vars -base invoice-reports {organization_id new_clients_p account_manager_p}]]
 
@@ -103,7 +108,7 @@
     } else {
 	set short_month [template::util::date::monthName $iv_month short]
     }
-    set iv_total_amount [db_string get_iv_total_amount { }]
-    set iv_count [db_string get_iv_count { }]
+    set iv_total_amount [db_string get_iv_total_amount " "]
+    set iv_count [db_string get_iv_count " "]
 }