tax liability report adjustments, #25935, #26589, #27698

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

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
old mode 100755 (executable)
new mode 100644 (file)
index 08f255f..bf3b3d8
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -14,7 +14,7 @@ TD.sectionhead {
 .grid TH { background-color: #cccccc; padding: 0px 3px 2px }
 .row0 TD { background-color: #eeeeee; padding: 0px 3px 2px; text-align: right}
 .row1 TD { background-color: #ffffff; padding: 0px 3px 2px; text-align: right}
-TD.rowhead { font-weight: bold; text-align: left }
+TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
 .bigmath { font-size: large; font-weight: bold; font: sans-serif; text-align: center }
 .total { font-style: italic }
 </STYLE>
@@ -141,6 +141,19 @@ TD.rowhead { font-weight: bold; text-align: left }
 %   $rownum++;
 %   $prev_row = $row;
 % } # foreach my $row
+% # at the end of everything
+  </TBODY>
+% if ( $report->{outside} > 0 ) {
+  <TBODY CLASS="total" STYLE="background-color: #cccccc; line-height: 3">
+    <TR>
+      <TD CLASS="rowhead">
+        <% emt('Out of taxable region') %>
+      </TD>
+      <TD><% $money_sprintf->( $report->{outside } ) %></TD>
+      <TD COLSPAN=0></TD>
+    </TR>
+  </TBODY>
+% }
 </TABLE>
 
 <& /elements/footer.html &>
@@ -176,6 +189,12 @@ if ( $cgi->param('taxname') =~ /^([\w ]+)$/ ) {
   die "taxname required";
 }
 
+if ( $cgi->param('credit_date') eq 'cust_credit_bill' ) {
+  $params{credit_date} = 'cust_credit_bill';
+} else {
+  $params{credit_date} = 'cust_bill';
+}
+
 warn "PARAMS:\n".Dumper(\%params)."\n\n" if $DEBUG;
 
 my $report = FS::Report::Tax->report_internal(%params);
@@ -193,6 +212,11 @@ my $taxlink    = $p. "search/cust_bill_pkg.cgi?$dateagentlink;istax=1";
 my $exemptlink = $p. "search/cust_tax_exempt_pkg.cgi?$dateagentlink";
 my $creditlink = $p. "search/cust_bill_pkg.cgi?$dateagentlink;credit=1;istax=1";
 
+if ( $params{'credit_date'} eq 'cust_credit_bill' ) {
+  $creditlink =~ s/begin/credit_begin/;
+  $creditlink =~ s/end/credit_end/;
+}
+
 my %pkgclass_name = map { $_->classnum, $_->classname } qsearch('pkg_class');
 $pkgclass_name{''} = 'Unclassified';