Index: openacs-4/packages/expenses/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/expenses/www/admin/index.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/expenses/www/admin/index.tcl 31 May 2005 22:07:21 -0000 1.1 +++ openacs-4/packages/expenses/www/admin/index.tcl 2 Jun 2005 10:43:56 -0000 1.2 @@ -22,7 +22,7 @@ -multirow expenses \ -key exp_id \ -actions { - "Export All and MARK ALL Transferred" "export-confirm?all=1&mark=1" "Export All Expenses" + "Export All Non-Transferred and MARK ALL Transfered" "export-confirm?all=1&mark=1" "Export All Expenses" "Export All but DO NOT MARK Transferred" "export-confirm?all=1&mark=0" "Export Expenses" } -elements { exp_date { @@ -41,7 +41,7 @@ label "Course/Section" } exp_exported { - label "Exported" + label "Transferred" display_template { Yes @@ -51,6 +51,9 @@ } } + expense_codes { + label "Expense Codes" + } } -orderby { exp_date { orderby exp_date } exp_amount { orderby exp_amount } @@ -60,9 +63,11 @@ set orderby_clause "[template::list::orderby_clause -name expenses -orderby]" -db_multirow -extend {course} expenses get_expenses { } { +db_multirow -extend {course expense_codes} expenses get_expenses { } { # retrieve course/section for this expense - db_0or1row "section_info" "select section_name, course_id from dotlrn_ecommerce_section where community_id =:community_id" - set course_name [db_string "getcoursename" "select course_name from dotlrn_catalog where course_id = (select latest_revision from cr_items where item_id =:course_id)"] - set course "$course_name/$section_name" + if { [db_0or1row "section_info" "select section_name, course_id from dotlrn_ecommerce_section where community_id =:community_id"] } { + set course_name [db_string "getcoursename" "select course_name from dotlrn_catalog where course_id = (select latest_revision from cr_items where item_id =:course_id)"] + set course "$course_name/$section_name" + set expense_codes [expenses::list_expense_codes -id $exp_id] + } } \ No newline at end of file