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 767d8cf..09c56ab 100755 (executable)
--- a/httemplate/search/report_newtax.cgi
+++ b/httemplate/search/report_newtax.cgi
@@ -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>
@@ -64,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') || '$';
 
@@ -117,28 +119,31 @@ 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' ".
+    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(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
 
-    my $x = scalar_sql($t, [], $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 != 'COMP' ".
-      "AND ". FS::tax_rate_location->location_sql( map { $_ => $t->$_ }
-                                                       @taxparams
-                                                 );
+    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, [], $sql );
+    my $y = scalar_sql($t, [ 'itemdesc', 'itemdesc' ], $sql );
     $credit += $y;
     $taxes{$label}->{'credit'} += $y;
 
@@ -203,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>