projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing apache issues in debian packages
[freeside.git]
/
httemplate
/
search
/
cust_pay_batch.cgi
diff --git
a/httemplate/search/cust_pay_batch.cgi
b/httemplate/search/cust_pay_batch.cgi
index
dde5461
..
b47aaf3
100755
(executable)
--- 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+)$/ ) {
}
if ( $cgi->param('custnum') && $cgi->param('custnum') =~ /^(\d+)$/ ) {
- push @search, "custnum = $1";
+ push @search, "cust
_pay_batch.cust
num = $1";
}
if ( $cgi->param('status') && $cgi->param('status') =~ /^(\w)$/ ) {
}
if ( $cgi->param('status') && $cgi->param('status') =~ /^(\w)$/ ) {
@@
-87,7
+87,7
@@
if ( $cgi->param('payby') ) {
}
if ( not $cgi->param('dcln') ) {
}
if ( not $cgi->param('dcln') ) {
- push @search, "c
pb
.status IS DISTINCT FROM 'Approved'";
+ push @search, "c
ust_pay_batch
.status IS DISTINCT FROM 'Approved'";
}
my ($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
}
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);
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;
'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 ) '.
'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",
'LEFT JOIN cust_pay USING ( batchnum, custnum ) ',
'extra_sql' => $search,
'order_by' => "ORDER BY $orderby",