fix top subtotals on refund reports

[freeside.git] / httemplate / search / report_newtax.cgi

diff --git a/httemplate/search/report_newtax.cgi b/httemplate/search/report_newtax.cgi
index 0fb5483..09c56ab 100755 (executable)
--- a/httemplate/search/report_newtax.cgi
+++ b/httemplate/search/report_newtax.cgi
@@ -16,7 +16,10 @@
   <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>
   </TR>
 % my $bgcolor1 = '#eeeeee';
 % my $bgcolor2 = '#ffffff';
@@ -43,6 +46,12 @@
         <A HREF="<% $baselink. $link %>;istax=1"><% $money_char %><% sprintf('%.2f', $tax->{'tax'} ) %></A>
       </TD>
       <% !($tax->{base}) ? qq!<TD CLASS="grid" BGCOLOR="$bgcolor"></TD>! : '' %>
+      <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"></TD>
+      <% $tax->{base} ? qq!<TD CLASS="grid" BGCOLOR="$bgcolor"></TD>! : '' %>
+      <TD CLASS="grid" BGCOLOR="<% $bgcolor %>" ALIGN="right">
+        <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>
 % } 
 
@@ -55,6 +64,8 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
 
+#shit, all sorts of false laxiness w/tax_rate::geneate_liability_report
+
 my $conf = new FS::Conf;
 my $money_char = $conf->config('money_char') || '$';
 
@@ -80,16 +91,14 @@ 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';
 
 my $tax = 0;
+my $credit = 0;
 my %taxes = ();
 my %basetaxes = ();
 foreach my $t (qsearch({ table     => 'cust_bill_pkg',
@@ -100,7 +109,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} ) ) {
@@ -110,16 +119,34 @@ foreach my $t (qsearch({ table     => 'cust_bill_pkg',
     $taxes{$label}->{'url_param'} =
       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 );
+    my $payby_itemdesc_loc = 
+      "    payby != 'COMP' ".
+      "AND ( itemdesc = ? OR ? = '' AND itemdesc IS NULL ) ".
+      "AND ". FS::tax_rate_location->location_sql( map { $_ => $t->$_ }
+                                                       @taxparams
+                                                 );
+
+    my $taxwhere =
+      "FROM cust_bill_pkg $addl_from $where AND $payby_itemdesc_loc";
 
-    my $sql = "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) ".
-              " $taxwhere AND cust_bill_pkg.pkgnum = 0";
+    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, [ 'itemdesc', 'itemdesc' ], $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_itemdesc_loc";
+
+    $sql = "SELECT SUM(cust_credit_bill_pkg.amount) ".
+           " $creditwhere AND cust_bill_pkg.pkgnum = 0";
+
+    my $y = scalar_sql($t, [ 'itemdesc', 'itemdesc' ], $sql );
+    $credit += $y;
+    $taxes{$label}->{'credit'} += $y;
+
     unless ( exists( $taxes{$baselabel} ) ) {
 
       $basetaxes{$baselabel}->{'label'} = $baselabel;
@@ -129,6 +156,7 @@ foreach my $t (qsearch({ table     => 'cust_bill_pkg',
     }
 
     $basetaxes{$baselabel}->{'tax'} += $x;
+    $basetaxes{$baselabel}->{'credit'} += $y;
       
   }
 
@@ -160,6 +188,7 @@ push @taxes, {
   'label'          => 'Total',
   'url_param'      => '',
   'tax'            => $tax,
+  'credit'         => $credit,
   'base'           => 1,
 };
 
@@ -179,5 +208,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>