}
# pkg_classnum
+ # all_pkg_classnums
+ # any_pkg_status
if ( $params->{'pkg_classnum'} ) {
my @pkg_classnums = ref( $params->{'pkg_classnum'} ) ?
@{ $params->{'pkg_classnum'} } :
'part_pkg.classnum IN('. join(',', @pkg_classnums).')';
}
foreach (@pkg_where) {
- push @where, "EXISTS(".
+ my $select_pkg =
"SELECT 1 FROM cust_pkg JOIN part_pkg USING (pkgpart) WHERE ".
- "cust_pkg.custnum = cust_main.custnum AND ".
- $_ . ' AND ' . FS::cust_pkg->active_sql .
- ')';
+ "cust_pkg.custnum = cust_main.custnum AND $_ ";
+ if ( not $params->{'any_pkg_status'} ) {
+ $select_pkg .= 'AND '.FS::cust_pkg->active_sql;
+ }
+ push @where, "EXISTS($select_pkg)";
}
}
}
my @select = (
'cust_main.custnum',
+ 'cust_main.salesnum',
# there's a good chance that we'll need these
'cust_main.bill_locationnum',
'cust_main.ship_locationnum',
my ($field, $table) = reverse split('\.', $fuzzyfield);
$table ||= 'cust_main';
- return unless length($value);
+ return unless defined($value) && length($value);
open(CACHE, '>>:encoding(UTF-8)', "$dir/$table.$field" )
or die "can't open $dir/$table.$field: $!";