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 -N --- openacs-4/packages/invoices/lib/invoice-items-list.tcl 7 Nov 2005 23:10:51 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,273 +0,0 @@ -set optional_param_list [list elements category_filter_clause date_range_start date_range_end] -set optional_unset_list [list iv_items_orderby category_id \ - customer_id filter_package_id \ - project_status_id groupby] - -foreach optional_unset $optional_unset_list { - if {[info exists $optional_unset]} { - if {[empty_string_p [set $optional_unset]]} { - unset $optional_unset - } - } -} - -foreach optional_param $optional_param_list { - if {![info exists $optional_param]} { - set $optional_param {} - } -} - -set date_range_clause "" - -if { [exists_and_not_null date_range_start] } { - set date_range 1 - catch { set date_range_start [lc_time_fmt $date_range_start %y-%m-%d] } errMsg - append date_range_clause "to_char(oi.creation_date,'yy-mm-dd') >= :date_range_start" -} - -if { [exists_and_not_null date_range_end] } { - set date_range 1 - catch { set date_range_end [lc_time_fmt $date_range_end %y-%m-%d] } errMsg - - if { [exists_and_not_null date_range_start] } { - append date_range_clause " and to_char(oi.creation_date,'yy-mm-dd') <= :date_range_end" - } else { - append date_range_clause "to_char(oi.creation_date,'yy-mm-dd') <= :date_range_end" - } -} - -if {![info exist filters_p] } { - set filters_p 1 -} - -if {![info exists format]} { - set format "normal" -} - -if {![info exists page_size]} { - set page_size "25" -} - -if {![info exists invoice_package_id]} { - set invoice_package_id [ad_conn package_id] -} - -if {![info exists base_url]} { - set base_url [apm_package_url_from_id $invoice_package_id] -} - -if { ![exists_and_not_null return_url] } { - set return_url [ad_return_url] -} - -set categories_p 0 - -# Elements to construnct row_lists -if { [exists_and_not_null elements] } { - set row_list [list] - foreach element $elements { - if { ![string equal $element "categories"] } { - lappend row_list $element - lappend row_list [list] - } else { - set categories_p 1 - } - } -} else { - set row_list [list item_title {} final_amount {} invoice_title {} \ - rebate {} item_id {} invoice_item_id {} creation_date {}] -} - -# Create the elements for the list template -set elements [list] -set categories_filter [list] - -# We are going to create the elements for each mapped category tree -if { $categories_p } { - set categories_trees [db_list_of_lists get_category_trees { }] - - set mapped_objects [list] - set multirow_extend [list] - set tree_ids [list] - - foreach tree $categories_trees { - set tree_name [lindex $tree 0] - set tree_id [lindex $tree 1] - - lappend tree_ids $tree_id - lappend multirow_extend tree_$tree_id - - set label "$tree_name" - - lappend elements tree_$tree_id [list label $label] - lappend row_list tree_$tree_id - lappend row_list [list] - } - set categories [db_list_of_lists get_categories " "] - foreach cat $categories { - lappend categories_filter [list [lang::util::localize [lindex $cat 0]] [lindex $cat 1]] - } -} - -set aggregate_amount "" -if { [exists_and_not_null groupby] } { - append aggregate_amount "