X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=aec91c415b09db92dabf36a8d018d2d810fc1116;hp=a98d36f3c50d7f3ce6904e88a456dd64ca027797;hb=29a82b24b37fee37588efb96928574ac1a452d88;hpb=1238858779262e56f45aef69d33b54052407c7f7

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index a98d36f3c..aec91c415 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -40,22 +40,38 @@ foreach my $r (
     $label = $r->county." county, $label" if $r->county;
   }
 
-  my $fromwhere = "
-    FROM cust_bill_pkg
-      JOIN cust_bill USING ( invnum ) 
-      JOIN cust_main USING ( custnum )
+  my $join_pkg = "
       JOIN cust_pkg USING ( pkgnum )
       JOIN part_pkg USING ( pkgpart )
+  ";
+
+  my $where = "
     WHERE _date >= $beginning AND _date <= $ending
       AND ( county  = ? OR ? = '' )
       AND ( state   = ? OR ? = '' )
       AND ( country = ? )
-      AND ( taxclass = ? OR ? = '' )
       AND payby != 'COMP'
   ";
+
+  my $taxwhere = my $fromwhere = "
+    FROM cust_bill_pkg
+      JOIN cust_bill USING ( invnum ) 
+      JOIN cust_main USING ( custnum )
+  ";
+
+  $fromwhere .= $join_pkg. $where;
+  $taxwhere .= $where;
+
+  my @taxparam = my @param = qw( county county state state country );
+
+  if ( $r->taxclass ) {
+    $fromwhere .= " AND ( taxclass = ?  ) ";
+    push @param, 'taxclass';
+  }
+
   my $nottax = 'pkgnum != 0';
 
-  my $a = scalar_sql($r,
+  my $a = scalar_sql($r, \@param,
     "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $fromwhere AND $nottax"
   );
   $total += $a;
@@ -63,7 +79,7 @@ foreach my $r (
 
   foreach my $e ( grep { $r->get($_.'tax') =~ /^Y/i }
                        qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
-    my $x = scalar_sql($r,
+    my $x = scalar_sql($r, \@param,
       "SELECT SUM($e) $fromwhere AND $nottax"
     );
     $exempt += $x;
@@ -72,13 +88,13 @@ foreach my $r (
 
   foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i }
                        qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
-    my $t = scalar_sql($r,
+    my $t = scalar_sql($r, \@param, 
       "SELECT SUM($e) $fromwhere AND $nottax AND ( tax != 'Y' OR tax IS NULL )"
     );
     $taxable += $t;
     $regions{$label}->{'taxable'} += $t;
 
-    my $x = scalar_sql($r,
+    my $x = scalar_sql($r, \@param, 
       "SELECT SUM($e) $fromwhere AND $nottax AND tax = 'Y'"
     );
     $exempt += $x;
@@ -94,8 +110,8 @@ foreach my $r (
 
   #match itemdesc if necessary!
   my $named_tax = $r->taxname ? 'AND itemdesc = '. dbh->quote($r->taxname) : '';
-  my $x = scalar_sql($r,
-    "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $fromwhere ".
+  my $x = scalar_sql($r, \@taxparam,
+    "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $taxwhere ".
     "AND pkgnum = 0 $named_tax",
   );
   $tax += $x;
@@ -124,11 +140,10 @@ push @regions, {
 #false laziness w/FS::Report::Table::Monthly (sub should probably be moved up
 #to FS::Report or FS::Record or who the fuck knows where)
 sub scalar_sql {
-  my( $r, $sql ) = @_;
+  my( $r, $param, $sql ) = @_;
   #warn "$sql\n";
   my $sth = dbh->prepare($sql) or die dbh->errstr;
-  $sth->execute( map $r->$_(),
-                     qw( county county state state country taxclass taxclass ) )
+  $sth->execute( map $r->$_(), @$param )
     or die "Unexpected error executing statement $sql: ". $sth->errstr;
   $sth->fetchrow_arrayref->[0] || 0;
 }