X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pay_batch.cgi;h=b47aaf37c116b6a5d4e4e4001679450b6ed00127;hb=0788d4bf43324dd87c224a43983c8066f9cb2cbe;hp=dde54614347a33b2e49c18c9edfce6341480d84c;hpb=c13c6407510f6fd1783ce0fbd97800afa27c30b5;p=freeside.git diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi index dde546143..b47aaf37c 100755 --- a/httemplate/search/cust_pay_batch.cgi +++ b/httemplate/search/cust_pay_batch.cgi @@ -72,7 +72,7 @@ if ( $cgi->param('batchnum') && $cgi->param('batchnum') =~ /^(\d+)$/ ) { } if ( $cgi->param('custnum') && $cgi->param('custnum') =~ /^(\d+)$/ ) { - push @search, "custnum = $1"; + push @search, "cust_pay_batch.custnum = $1"; } if ( $cgi->param('status') && $cgi->param('status') =~ /^(\w)$/ ) { @@ -87,7 +87,7 @@ if ( $cgi->param('payby') ) { } if ( not $cgi->param('dcln') ) { - push @search, "cpb.status IS DISTINCT FROM 'Approved'"; + push @search, "cust_pay_batch.status IS DISTINCT FROM 'Approved'"; } my ($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi); @@ -105,7 +105,7 @@ push @search, $curuser->agentnums_sql({ table => 'pay_batch', my $search = ' WHERE ' . join(' AND ', @search); -$count_query = 'SELECT COUNT(*) FROM cust_pay_batch AS cpb ' . +$count_query = 'SELECT COUNT(*) FROM cust_pay_batch ' . 'LEFT JOIN cust_main USING ( custnum ) ' . 'LEFT JOIN pay_batch USING ( batchnum )' . $search; @@ -116,7 +116,6 @@ $sql_query = { 'hashref' => {}, 'addl_from' => 'LEFT JOIN pay_batch USING ( batchnum ) '. 'LEFT JOIN cust_main USING ( custnum ) '. - 'LEFT JOIN cust_pay USING ( batchnum, custnum ) ', 'extra_sql' => $search, 'order_by' => "ORDER BY $orderby",