diff options
| author | ivan <ivan> | 2003-09-26 09:31:09 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2003-09-26 09:31:09 +0000 |
| commit | 81f959a3bf9b3774e11274912f8c0df9fe007eb8 (patch) | |
| tree | e820e6ee4d0df8f9afc590fbb528e835ebc51684 | |
| parent | d6f6a3ef5dbc2f14fcf91144fb5a6d5532f0fbd0 (diff) | |
scalar/array scope fix... new, multiple (i.e. canadian GST/PST) taxes work now!
| -rw-r--r-- | FS/FS/cust_main.pm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index 38c86f787..cf8589a8b 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -1081,18 +1081,20 @@ sub bill { unless ( $self->tax =~ /Y/i || $self->payby eq 'COMP' ) { - my @taxes = qsearch( 'cust_main_county', { - 'state' => $self->state, - 'county' => $self->county, - 'country' => $self->country, - 'taxclass' => $part_pkg->taxclass, - } ) - || qsearch( 'cust_main_county', { + my @taxes = qsearch( 'cust_main_county', { + 'state' => $self->state, + 'county' => $self->county, + 'country' => $self->country, + 'taxclass' => $part_pkg->taxclass, + } ); + unless ( @taxes ) { + @taxes = qsearch( 'cust_main_county', { 'state' => $self->state, 'county' => $self->county, 'country' => $self->country, 'taxclass' => '', } ); + } # maybe eliminate this entirely, along with all the 0% records unless ( @taxes ) { |