projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b953866
)
hmm, add no_empty_county option to location_sql search, for tax reports. RT#4878
author
ivan
<ivan>
Sat, 21 Feb 2009 20:14:55 +0000
(20:14 +0000)
committer
ivan
<ivan>
Sat, 21 Feb 2009 20:14:55 +0000
(20:14 +0000)
FS/FS/cust_pkg.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_pkg.pm
b/FS/FS/cust_pkg.pm
index
22dc7f2
..
203a269
100644
(file)
--- a/
FS/FS/cust_pkg.pm
+++ b/
FS/FS/cust_pkg.pm
@@
-2359,16
+2359,18
@@
substitute for the placeholders in that fragment.
sub location_sql {
my($class, %opt) = @_;
my $ornull = $opt{'ornull'};
sub location_sql {
my($class, %opt) = @_;
my $ornull = $opt{'ornull'};
+ my $nec = $opt{'noempty_county'};
my $conf = new FS::Conf;
# '?' placeholders in _location_sql_where
my @bill_param;
if ( $ornull ) {
my $conf = new FS::Conf;
# '?' placeholders in _location_sql_where
my @bill_param;
if ( $ornull ) {
- @bill_param = qw( county county
county
state state state country );
+ @bill_param = qw( county county state state state country );
} else {
} else {
- @bill_param = qw( county
county
state state country );
+ @bill_param = qw( county state state country );
}
}
+ unshift @bill_param, 'county' unless $nec;
my $main_where;
my @main_param;
my $main_where;
my @main_param;
@@
-2376,10
+2378,10
@@
sub location_sql {
$main_where = "(
( ( ship_last IS NULL OR ship_last = '' )
$main_where = "(
( ( ship_last IS NULL OR ship_last = '' )
- AND ". _location_sql_where('cust_main', '', $ornull ). "
+ AND ". _location_sql_where('cust_main', '', $ornull
, $nec
). "
)
OR ( ship_last IS NOT NULL AND ship_last != ''
)
OR ( ship_last IS NOT NULL AND ship_last != ''
- AND ". _location_sql_where('cust_main', 'ship_', $ornull). "
+ AND ". _location_sql_where('cust_main', 'ship_', $ornull
, $nec
). "
)
)";
# AND payby != 'COMP'
)
)";
# AND payby != 'COMP'
@@
-2397,10
+2399,17
@@
sub location_sql {
my @param;
if ( $conf->exists('tax-pkg_address') ) {
my @param;
if ( $conf->exists('tax-pkg_address') ) {
+ my $loc_where = _location_sql_where( 'cust_location',
+ '', #prefix
+ $ornull,
+ $nec,
+ );
+
$where = " (
$where = " (
- ( cust_pkg.locationnum IS NULL AND $main_where )
- OR ( cust_pkg.locationnum IS NOT NULL AND ". _location_sql_where('cust_location', '', $ornull). " )
- )";
+ ( cust_pkg.locationnum IS NULL AND $main_where )
+ OR ( cust_pkg.locationnum IS NOT NULL AND $loc_where )
+ )
+ ";
@param = ( @main_param, @bill_param );
} else {
@param = ( @main_param, @bill_param );
} else {
@@
-2414,15
+2423,19
@@
sub location_sql {
}
}
-#subroutine, helper for
able
+#subroutine, helper for
location_sql
sub _location_sql_where {
sub _location_sql_where {
- my $table = shift;
- my $prefix = @_ ? shift : '';
- my $ornull = @_ ? shift : '';
- $ornull = $ornull ? ' OR ? IS NULL ' : '';
+ my $table = shift;
+ my $prefix = @_ ? shift : '';
+ my $ornull = @_ ? shift : '';
+ my $no_empty_county = @_ ? shift : '';
+
+ $ornull = $ornull ? ' OR ? IS NULL ' : '';
+ my $or_empty_county = $no_empty_county ? '' : " OR ? = '' ";
+
"
"
- ( $table.${prefix}county = ?
OR ? = ''
$ornull )
- AND ( $table.${prefix}state = ? OR ? = '' $ornull )
+ ( $table.${prefix}county = ?
$or_empty_county
$ornull )
+ AND ( $table.${prefix}state = ? OR ? = ''
$ornull )
AND $table.${prefix}country = ?
";
}
AND $table.${prefix}country = ?
";
}