Index: openacs-4/packages/invoices/lib/invoice-items-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/invoice-items-list.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/invoices/lib/invoice-items-list.tcl 7 Nov 2005 23:10:51 -0000 1.5
+++ openacs-4/packages/invoices/lib/invoice-items-list.tcl 5 Jun 2006 13:09:41 -0000 1.6
@@ -109,30 +109,7 @@
}
}
-set aggregate_amount ""
-if { [exists_and_not_null groupby] } {
- append aggregate_amount "
Aggregate Amount: | |
"
- foreach cat $categories_filter {
- set c_name [lindex $cat 0]
- set c_id [lindex $cat 1]
- if { [exists_and_not_null category_id] } {
- if { [string equal $c_id $category_id] } {
- append aggregate_amount "- $c_name:
| "
- set amount [db_string get_amount { }]
- append aggregate_amount "$amount | "
- append aggregate_amount "
"
- }
- } else {
- append aggregate_amount "- $c_name:
| "
- set amount [db_string get_amount { }]
- append aggregate_amount "$amount | "
- append aggregate_amount "
"
- }
- }
-append aggregate_amount ""
-}
-
lappend elements item_title [list label "[_ invoices.Invoice_Item_title]"] \
final_amount [list label "[_ invoices.Final_Amount]"] \
invoice_title [list label "[_ invoices.Invoice_Title]" \
@@ -271,3 +248,26 @@
}
}
}
+
+set aggregate_amount ""
+if { [exists_and_not_null groupby] } {
+ append aggregate_amount "Aggregate Amount: | |
"
+ foreach cat $categories_filter {
+ set c_name [lindex $cat 0]
+ set c_id [lindex $cat 1]
+ if { [exists_and_not_null category_id] } {
+ if { [string equal $c_id $category_id] } {
+ append aggregate_amount "- $c_name:
| "
+ set amount [db_string get_amount { }]
+ append aggregate_amount "$amount | "
+ append aggregate_amount "
"
+ }
+ } else {
+ append aggregate_amount "- $c_name:
| "
+ set amount [db_string get_amount { }]
+ append aggregate_amount "$amount | "
+ append aggregate_amount "
"
+ }
+ }
+append aggregate_amount ""
+}