diff options
| author | ivan <ivan> | 2004-10-26 06:33:30 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2004-10-26 06:33:30 +0000 |
| commit | bc502a713cb1e8164ece5bc224cde4f301764bfe (patch) | |
| tree | 4e00ecc5227817124e6a48366ea383806967bc03 /httemplate | |
| parent | e5d5e872f7394f48a835b241dbb2e7f192c0e0f1 (diff) | |
and one last case with named and not named taxes in the same region, ack
Diffstat (limited to 'httemplate')
| -rwxr-xr-x | httemplate/search/report_tax.cgi | 5 |
1 files changed, 4 insertions, 1 deletions
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", |