projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cc839bb
)
"Without census tract" search should look at the service location, #22741, #940
author
Mark Wells
<mark@freeside.biz>
Thu, 2 May 2013 23:21:56 +0000
(16:21 -0700)
committer
Mark Wells
<mark@freeside.biz>
Thu, 2 May 2013 23:21:56 +0000
(16:21 -0700)
FS/FS/cust_main/Search.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_main/Search.pm
b/FS/FS/cust_main/Search.pm
index
7dbb7a8
..
e0c7080
100644
(file)
--- a/
FS/FS/cust_main/Search.pm
+++ b/
FS/FS/cust_main/Search.pm
@@
-624,14
+624,14
@@
sub search {
# parse without census tract checkbox
##
# parse without census tract checkbox
##
- push @where, "(
censustract = '' or
censustract is null)"
+ push @where, "(
ship_location.censustract = '' or ship_location.
censustract is null)"
if $params->{'no_censustract'};
##
# parse with hardcoded tax location checkbox
##
if $params->{'no_censustract'};
##
# parse with hardcoded tax location checkbox
##
- push @where, "geocode is not null"
+ push @where, "
ship_location.
geocode is not null"
if $params->{'with_geocode'};
##
if $params->{'with_geocode'};
##
@@
-841,7
+841,7
@@
sub search {
'ON (cust_main.'.$pre.'locationnum = '.$pre.'location.locationnum) ';
}
'ON (cust_main.'.$pre.'locationnum = '.$pre.'location.locationnum) ';
}
- my $count_query = "SELECT COUNT(*) FROM cust_main $extra_sql";
+ my $count_query = "SELECT COUNT(*) FROM cust_main $
addl_from $
extra_sql";
my @select = (
'cust_main.custnum',
my @select = (
'cust_main.custnum',
@@
-927,6
+927,8
@@
sub search {
'extra_headers' => \@extra_headers,
'extra_fields' => \@extra_fields,
};
'extra_headers' => \@extra_headers,
'extra_fields' => \@extra_fields,
};
+ warn Data::Dumper::Dumper($sql_query);
+ $sql_query;
}
}