freeside/httemplate/search report_tax.cgi,1.5.4.12,1.5.4.13

[ivan]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory pouncequick:/tmp/cvs-serv27674

Modified Files:
      Tag: FREESIDE_1_4_BRANCH
	report_tax.cgi 
Log Message:
and one last case with named and not named taxes in the same region, ack

Index: report_tax.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_tax.cgi,v
retrieving revision 1.5.4.12
retrieving revision 1.5.4.13
diff -u -d -r1.5.4.12 -r1.5.4.13
--- report_tax.cgi	26 Oct 2004 06:04:12 -0000	1.5.4.12
+++ report_tax.cgi	26 Oct 2004 06:33:30 -0000	1.5.4.13
@@ -122,7 +122,10 @@
   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",