sales tax report: detail link and better accuracy for "out of taxable" calculation...

[freeside.git] / FS / FS / Report / Tax.pm

diff --git a/FS/FS/Report/Tax.pm b/FS/FS/Report/Tax.pm
index f53414b..713be02 100644 (file)
--- a/FS/FS/Report/Tax.pm
+++ b/FS/FS/Report/Tax.pm
@@ -7,7 +7,7 @@ use Date::Format qw( time2str );
 
 use Data::Dumper;
 
-$DEBUG = 2;
+$DEBUG = 0;
 
 =item report_internal OPTIONS
 
@@ -358,13 +358,13 @@ sub report_internal {
       SELECT 1 FROM cust_tax_exempt_pkg
         JOIN cust_main_county USING (taxnum)
         WHERE cust_tax_exempt_pkg.billpkgnum = cust_bill_pkg.billpkgnum
-          AND cust_main_county.taxname = '$taxname'
+          AND COALESCE(cust_main_county.taxname,'Tax') = '$taxname'
     )
     AND NOT EXISTS(
       SELECT 1 FROM cust_bill_pkg_tax_location
         JOIN cust_main_county USING (taxnum)
         WHERE cust_bill_pkg_tax_location.taxable_billpkgnum = cust_bill_pkg.billpkgnum
-          AND cust_main_county.taxname = '$taxname'
+          AND COALESCE(cust_main_county.taxname,'Tax') = '$taxname'
     )
   ";
   warn "\nOUTSIDE:\n$sql_outside\n" if $DEBUG;
@@ -500,7 +500,6 @@ sub title {
   if ( $self->{opt}->{agentnum} ) {
     my $agent = qsearchs('agent', { agentnum => $self->{opt}->{agentnum} });
     $string .= $agent->agent . ' ';
-    warn $string;
   }
   $string .= 'Tax Report: '; # XXX localization
   if ( $self->{opt}->{beginning} ) {