Index: openacs-4/packages/expenses/tcl/expenses-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/expenses/tcl/expenses-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/expenses/tcl/expenses-procs.tcl	16 Jul 2005 13:02:36 -0000	1.6
+++ openacs-4/packages/expenses/tcl/expenses-procs.tcl	4 Aug 2005 06:51:55 -0000	1.7
@@ -43,13 +43,51 @@
 	Return comma separated list of expense codes given an expense id
 } {
 	set expense_codes ""
-	set categories [category::get_mapped_categories $id]
-	foreach category_id $categories {
-		append expense_codes "[category::get_name $category_id]"
+	# Get category tree id of expense code
+	set package_id [expenses::get_package_id]
+	set tree_list [category_tree::get_mapped_trees $package_id]
+	foreach tree $tree_list {
+		if { [lindex $tree 1] == "Expense Codes"} {
+			set tree_id [lindex $tree 0]
+		}
 	}
-	return [join $expense_codes ", "]
+	if { [exists_and_not_null tree_id] } {
+		set categories [category::get_mapped_categories -tree_id $tree_id $id]
+		foreach category_id $categories {
+			append expense_codes "[category::get_name $category_id]"
+		}
+		return [join $expense_codes ", "]
+	} else {
+		return ""
+	}
 }
 
+ad_proc list_expense_types {
+	{-id:required }
+} {
+	HAM (hamilton.chua@gmail.com)
+	Return comma separated list of expense types given an expense id
+} {
+	set expense_types ""
+	# Get category tree id of expense type
+	set package_id [expenses::get_package_id]
+	set tree_list [category_tree::get_mapped_trees $package_id]
+	foreach tree $tree_list {
+		if { [lindex $tree 1] == "Expense Types"} {
+			set tree_id [lindex $tree 0]
+		}
+	}	
+	if { [exists_and_not_null tree_id] } {
+		set categories [category::get_mapped_categories -tree_id $tree_id $id]
+		foreach category_id $categories {
+			append expense_types "[category::get_name $category_id]"
+		}
+		return [join $expense_types ", "]
+	} else {
+		return ""
+	}
+}
+
 ad_proc list_terms {
 	{-id:required }
 } {