combine ticket notification scrips, #15353

[freeside.git] / httemplate / search / report_prepaid_income.cgi

diff --git a/httemplate/search/report_prepaid_income.cgi b/httemplate/search/report_prepaid_income.cgi
index c0e2b80..2fe5b6f 100644 (file)
--- a/httemplate/search/report_prepaid_income.cgi
+++ b/httemplate/search/report_prepaid_income.cgi
@@ -84,7 +84,7 @@ my $actual_label = $legacy ? 'Actual ' : '';
 
 my $time = time;
 
-my $now = $cgi->param('date') && str2time($cgi->param('date')) || $time;
+my $now = $cgi->param('date') && parse_datetime($cgi->param('date')) || $time;
 $now =~ /^(\d+)$/ or die "unparsable date?";
 $now = $1;
 
@@ -108,10 +108,6 @@ my @where = ();
 #here is the agent virtualization
 push @where, $curuser->agentnums_sql( 'table'=>'cust_main' );
 
-#well, because cust_bill_pkg.cgi has it and without it the numbers don't match..
-push @where , " payby != 'COMP' "
-  unless $cgi->param('include_comp_cust');
-
 my %total = ();
 my %total_legacy = ();
 foreach my $agentnum (@agentnums) {