freeside/httemplate/search report_tax.cgi,1.5.4.14,1.5.4.15

[ivan]

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

Modified Files:
      Tag: FREESIDE_1_4_BRANCH
	report_tax.cgi 
Log Message:
fix for correct reporting of generic taxes

Index: report_tax.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_tax.cgi,v
retrieving revision 1.5.4.14
retrieving revision 1.5.4.15
diff -u -d -r1.5.4.14 -r1.5.4.15
--- report_tax.cgi	9 Nov 2004 09:12:57 -0000	1.5.4.14
+++ report_tax.cgi	9 Nov 2004 09:13:38 -0000	1.5.4.15
@@ -125,7 +125,7 @@
   my $named_tax =
     $r->taxname
       ? 'AND itemdesc = '. dbh->quote($r->taxname)
-      : "AND itemdesc IS NULL or itemdesc = ''";
+      : "AND itemdesc IS NULL OR itemdesc = '' OR itemdesc = 'Tax'";
   my $x = scalar_sql($r, \@taxparam,
     "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $taxwhere ".
     "AND pkgnum = 0 $named_tax",