X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_newtax.cgi;h=4ec3f4da4a017267c3498eeb833795ff2f7dcaf2;hb=636dd1f25af52d35efe7a323a5765ff5adeadf83;hp=559d89ded0b9b6fa58776b59f8f14b87a44c4261;hpb=5a4db25ecf6a56c0777c52c4d172c675dad0791b;p=freeside.git

diff --git a/httemplate/search/report_newtax.cgi b/httemplate/search/report_newtax.cgi
index 559d89ded..4ec3f4da4 100755
--- a/httemplate/search/report_newtax.cgi
+++ b/httemplate/search/report_newtax.cgi
@@ -16,7 +16,7 @@
   <TR>
     <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
     <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc">Tax collected</TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">Tax invoiced</TH>
     <TH CLASS="grid" BGCOLOR="#cccccc">&nbsp;&nbsp;&nbsp;&nbsp;</TH>
     <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
     <TH CLASS="grid" BGCOLOR="#cccccc">Tax credited</TH>
@@ -49,7 +49,7 @@
       <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"></TD>
       <% $tax->{base} ? qq!<TD CLASS="grid" BGCOLOR="$bgcolor"></TD>! : '' %>
       <TD CLASS="grid" BGCOLOR="<% $bgcolor %>" ALIGN="right">
-        <A HREF="<% $baselink. $link %>;istax=1;iscredit=rate"><% $money_char %><% sprintf('%.2f', $tax->{'credit'} ) %></A>
+        <A HREF="<% $creditlink. $link %>;istax=1;iscredit=rate"><% $money_char %><% sprintf('%.2f', $tax->{'credit'} ) %></A>
       </TD>
       <% !($tax->{base}) ? qq!<TD CLASS="grid" BGCOLOR="$bgcolor"></TD>! : '' %>
     </TR>
@@ -89,12 +89,9 @@ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
   $where .= ' AND cust_main.agentnum = '. $agent->agentnum;
 }
 
-# my ( $location_sql, @location_param ) = FS::cust_pkg->location_sql;
-# $where .= " AND $location_sql";
-#my @taxparam = ( 'itemdesc', @location_param );
-# now something along the lines of geocode matching ?
-#$where .= FS::cust_pkg->_location_sql_where('cust_tax_location');;
-my @taxparam = ( 'itemdesc', 'tax_rate_location.state', 'tax_rate_location.county', 'tax_rate_location.city', 'cust_bill_pkg_tax_rate_location.locationtaxid' );
+#my @taxparam = ( 'itemdesc', 'tax_rate_location.state', 'tax_rate_location.county', 'tax_rate_location.city', 'cust_bill_pkg_tax_rate_location.locationtaxid' );
+my @taxparams = qw( city county state locationtaxid );
+my @params = ('itemdesc', @taxparams);
 
 my $select = 'DISTINCT itemdesc,locationtaxid,tax_rate_location.state,tax_rate_location.county,tax_rate_location.city';
 
@@ -110,7 +107,7 @@ foreach my $t (qsearch({ table     => 'cust_bill_pkg',
                       })
               )
 {
-  my @params = map { my $f = $_; $f =~ s/.*\.//; $f } @taxparam;
+  #my @params = map { my $f = $_; $f =~ s/.*\.//; $f } @taxparam;
   my $label = join('~', map { $t->$_ } @params);
   $label = 'Tax'. $label if $label =~ /^~/;
   unless ( exists( $taxes{$label} ) ) {
@@ -121,23 +118,27 @@ foreach my $t (qsearch({ table     => 'cust_bill_pkg',
       join(';', map { "$_=". uri_escape($t->$_) } @params);
 
     my $taxwhere = "FROM cust_bill_pkg $addl_from $where AND payby != 'COMP' ".
-      "AND ". join( ' AND ', map { "( $_ = ? OR ? = '' AND $_ IS NULL)" } @taxparam );
+      "AND ". FS::tax_rate_location->location_sql( map { $_ => $t->$_ }
+                                                       @taxparams
+                                                 );
 
     my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
 
-    my $x = scalar_sql($t, [ map { $_, $_ } @params ], $sql );
+    my $x = scalar_sql($t, [], $sql );
     $tax += $x;
     $taxes{$label}->{'tax'} += $x;
 
     my $creditfrom = " JOIN cust_credit_bill_pkg USING (billpkgnum,billpkgtaxratelocationnum) ";
     my $creditwhere = "FROM cust_bill_pkg $addl_from $creditfrom $where ".
       "AND payby != 'COMP' ".
-      "AND ". join( ' AND ', map { "( $_ = ? OR ? = '' AND $_ IS NULL)" } @taxparam );
+      "AND ". FS::tax_rate_location->location_sql( map { $_ => $t->$_ }
+                                                       @taxparams
+                                                 );
 
     $sql = "SELECT SUM(cust_credit_bill_pkg.amount) ".
            " $creditwhere AND cust_bill_pkg.pkgnum = 0";
 
-    my $y = scalar_sql($t, [ map { $_, $_ } @params ], $sql );
+    my $y = scalar_sql($t, [], $sql );
     $credit += $y;
     $taxes{$label}->{'credit'} += $y;
 
@@ -202,5 +203,6 @@ my $dateagentlink = "begin=$beginning;end=$ending";
 $dateagentlink .= ';agentnum='. $cgi->param('agentnum')
   if length($agentname);
 my $baselink   = $p. "search/cust_bill_pkg.cgi?$dateagentlink";
+my $creditlink = $p. "search/cust_credit_bill_pkg.html?$dateagentlink";
 
 </%init>