From d51b66e2ba1ea7378096bbe28037f7eb459d6011 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 3 Feb 2009 21:33:12 +0000
Subject: [PATCH] the taxproductnum is ALWAYS one of the filtering conditions

---
 FS/FS/part_pkg.pm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 563a5cfc5..e53d7b821 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -1015,10 +1015,13 @@ sub part_pkg_taxrate {
     ')';
   # much more CCH oddness in m2m -- this is kludgy
   my @tpnums = $self->_expand_cch_taxproductnum($class);
-  $extra_sql .= ' AND ('.
-                          join(' OR ', map{ "taxproductnum = $_" } @tpnums ).
-                     ')'
-     if @tpnums;
+  if (scalar(@tpnums)) {
+    $extra_sql .= ' AND ('.
+                            join(' OR ', map{ "taxproductnum = $_" } @tpnums ).
+                       ')';
+  } else {
+    $extra_sql .= ' AND ( 0 = 1 )';
+  }
 
   my $addl_from = 'LEFT JOIN part_pkg_taxproduct USING ( taxproductnum )';
   my $order_by = 'ORDER BY taxclassnum, length(geocode) desc, length(taxproduct) desc';
-- 
2.11.0