Index: openacs-4/packages/invoices/lib/projects-billable.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/projects-billable.tcl,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/invoices/lib/projects-billable.tcl	11 Aug 2006 19:37:51 -0000	1.18
+++ openacs-4/packages/invoices/lib/projects-billable.tcl	19 Oct 2006 17:06:49 -0000	1.19
@@ -71,6 +71,18 @@
     append row_list "$element {}\n"
 }
 
+# Make sure we don't kill ourself
+set new_elements [list] 
+foreach element $elements {
+    if {$element eq "count_total" || $element eq "count_billed"} {
+	# get rid of it
+    } else {
+	lappend new_elements $element
+    }
+}
+
+set elements $new_elements
+
 if {[lsearch $elements "count_total"] > -1 || [lsearch $elements "count_billed"] > -1} {
     set query "projects_to_bill2"
 } else {
@@ -119,12 +131,6 @@
 	    label {[_ invoices.iv_invoice_amount_open]}
 	    display_template {@projects.amount_open@ @projects.currency@}
         }
-	count_total {
-	    label {[_ invoices.iv_invoice_count_total]}
-	}
-	count_billed {
-	    label {[_ invoices.iv_invoice_count_billed]}
-	}
 	creation_date {
 	    label {[_ invoices.iv_invoice_closed_date]}
 	}
@@ -167,12 +173,6 @@
 	    orderby_asc {lower(r.description) asc, r.item_id}
 	    default_direction asc
 	}
-        amount_open {
-	    label {[_ invoices.iv_invoice_amount_open]}
-	    orderby_desc {sub.amount_open desc, r.item_id}
-	    orderby_asc {sub.amount_open asc, r.item_id}
-	    default_direction desc
-        }
 	creation_date {
 	    label {[_ invoices.iv_invoice_closed_date]}
 	    orderby {sub.creation_date}