X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcdr.html;h=a5575967c71b0e6dca3b4f92fe1d084a66dad50d;hb=995a145c931164347683071c95c6754379d36604;hp=cfbc5ed5d960316498783e892ebd4edcf0504e5b;hpb=457cf05ffc31212de613249c95a8ab05aed34f47;p=freeside.git diff --git a/httemplate/search/cdr.html b/httemplate/search/cdr.html index cfbc5ed5d..a5575967c 100644 --- a/httemplate/search/cdr.html +++ b/httemplate/search/cdr.html @@ -70,10 +70,11 @@ my @search = (); ### my $str2time_sql = str2time_sql; +my $closing = str2time_sql_closing; my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi); -push @search, "$str2time_sql calldate) >= $beginning ", - "$str2time_sql calldate) <= $ending"; +push @search, "$str2time_sql calldate $closing >= $beginning ", + "$str2time_sql calldate $closing <= $ending"; ### # duration / billsec @@ -125,7 +126,7 @@ foreach my $param ( grep /^termpart\d+status$/, $cgi->param ) { $search = "NOT EXISTS ( SELECT 1 FROM cdr_termination WHERE $where_term )"; - } elsif ( $cgi->param('freesidestatus') =~ /^([\w ]+)$/ ) { + } elsif ( $status =~ /^([\w ]+)$/ ) { #false lazienss w/cdr_termination.pm (i should be a part_termination method) my $where_term = @@ -187,6 +188,7 @@ if ( $cgi->param('cdrbatch') ) { my $cdr_batch = qsearchs('cdr_batch', { 'cdrbatch' => scalar($cgi->param('cdrbatch')) } ); if ( $cdr_batch ) { + $hashref->{cdrbatchnum} = $cdr_batch->cdrbatchnum; push @search, 'cdrbatchnum = '. $cdr_batch->cdrbatchnum; } else { die "unknown cdrbatch ". $cgi->param('cdrbatch');