From c0660bdfce760cc982a145fc3aebaaec911fc32a Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Thu, 5 Jun 2014 13:24:10 -0700 Subject: [PATCH] external taxes: avoid failing when the package has taxproductnums but no default taxproductnum, fallout from #25899 --- FS/FS/part_pkg.pm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm index e85da9da2..036daf705 100644 --- a/FS/FS/part_pkg.pm +++ b/FS/FS/part_pkg.pm @@ -1390,12 +1390,19 @@ sub tax_rates { $self->part_pkg_taxoverride($class); if (!@taxclassnums) { my $part_pkg_taxproduct = $self->taxproduct($class); + # If this isn't defined, then the class has no taxproduct designation, + # so return no tax rates. + return () if !$part_pkg_taxproduct; + + # convert the taxproduct to the tax classes that might apply to it in + # $geocode @taxclassnums = map { $_->taxclassnum } grep { $_->taxable eq 'Y' } # why do we need this? $part_pkg_taxproduct->part_pkg_taxrate($geocode); } return unless @taxclassnums; + # then look up the actual tax_rate entries warn "Found taxclassnum values of ". join(',', @taxclassnums) ."\n" if $DEBUG; my $extra_sql = "AND taxclassnum IN (". join(',', @taxclassnums) . ")"; -- 2.11.0