From: ivan <ivan>
Date: Tue, 26 Oct 2004 06:33:29 +0000 (+0000)
Subject: and one last case with named and not named taxes in the same region, ack
X-Git-Tag: BEFORE_FINAL_MASONIZE~888
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=717d562bcfb691d971a01b738d0b55cdda480cf0

and one last case with named and not named taxes in the same region, ack
---

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 838335b78..aa9ed6f11 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -122,7 +122,10 @@ foreach my $r (
   my @param = @base_param; 
 
   #match itemdesc if necessary!
-  my $named_tax = $r->taxname ? 'AND itemdesc = '. dbh->quote($r->taxname) : '';
+  my $named_tax =
+    $r->taxname
+      ? 'AND itemdesc = '. dbh->quote($r->taxname)
+      : "AND itemdesc IS NULL or itemdesc = ''";
   my $x = scalar_sql($r, \@taxparam,
     "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $taxwhere ".
     "AND pkgnum = 0 $named_tax",