X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=aec91c415b09db92dabf36a8d018d2d810fc1116;hb=aa7cea152a7d28244d5a8394ef58f88e11c20cda;hp=4de733c239102334179f690908df2cd139245738;hpb=ae00571d0778ec52f83d985ac89fb7adf3072f95;p=freeside.git

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 4de733c23..aec91c415 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -40,42 +40,61 @@ foreach my $r (
     $label = $r->county." county, $label" if $r->county;
   }
 
-  #match taxclass too?
+  my $join_pkg = "
+      JOIN cust_pkg USING ( pkgnum )
+      JOIN part_pkg USING ( pkgpart )
+  ";
 
-  my $fromwhere = "
-    FROM cust_bill_pkg
-      JOIN cust_bill USING ( invnum ) 
-      JOIN cust_main USING ( custnum )
+  my $where = "
     WHERE _date >= $beginning AND _date <= $ending
       AND ( county  = ? OR ? = '' )
       AND ( state   = ? OR ? = '' )
       AND ( country = ? )
       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,
-    "SELECT SUM(setup+recur) $fromwhere AND $nottax"
+  my $a = scalar_sql($r, \@param,
+    "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $fromwhere AND $nottax"
   );
   $total += $a;
   $regions{$label}->{'total'} += $a;
 
-  foreach my $e ( grep { $r->get($_.'tax') =~ /^Y/i } qw( setup recur ) ) {
-    my $x = scalar_sql($r,
+  foreach my $e ( grep { $r->get($_.'tax') =~ /^Y/i }
+                       qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
+    my $x = scalar_sql($r, \@param,
       "SELECT SUM($e) $fromwhere AND $nottax"
     );
     $exempt += $x;
     $regions{$label}->{'exempt'} += $x;
   }
 
-  foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i } qw( setup recur ) ) {
-    my $t = scalar_sql($r,
+  foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i }
+                       qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
+    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;
@@ -91,8 +110,9 @@ 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(setup+recur) $fromwhere AND pkgnum = 0 $named_tax",
+  my $x = scalar_sql($r, \@taxparam,
+    "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $taxwhere ".
+    "AND pkgnum = 0 $named_tax",
   );
   $tax += $x;
   $regions{$label}->{'tax'} += $x;
@@ -120,10 +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 ) )
+  $sth->execute( map $r->$_(), @$param )
     or die "Unexpected error executing statement $sql: ". $sth->errstr;
   $sth->fetchrow_arrayref->[0] || 0;
 }