X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=2b531ea466e2342ae5b82561c38f92b2df9cb46d;hb=cf17ad2a9c82d07412409b6dfea9bfb9be7d830c;hp=491cd42c53297c377d268257133caf9edb2d0ea9;hpb=6d0042982eec69028b9deef42ab2cd8ae015a077;p=freeside.git
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 491cd42c5..2b531ea46 100644
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -18,11 +18,12 @@ 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 }
+
<& /elements/table-grid.html &>
- Sales
+ Sales
Rate
@@ -32,6 +33,8 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
Tax credited
Net tax due
+
+ Tax collected
@@ -39,6 +42,7 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
@@ -71,10 +75,19 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
% } # if $row->{pkgclass} ne ...
% # construct base links that limit to the tax rates described by this row
+% # cust_bill_pkg.cgi wants a list of specific taxnums (and package class)
+% # cust_credit_bill_pkg.html wants a geographic scope (and package class)
% my $rowlink = ';taxnum=' . $row->{taxnums};
+% my $rowregion = ';country=' . $cgi->param('country');
+% foreach my $loc (qw(state county city district)) {
+% if ( $row->{$loc} ) {
+% $rowregion .= ";$loc=" . uri_escape($row->{$loc});
+% }
+% }
% # and also the package class, if we're limiting package class
% if ( $params{breakdown}->{pkgclass} ) {
% $rowlink .= ';classnum=' . ($row->{pkgclass} || 0);
+% $rowregion .= ';classnum=' . ($row->{pkgclass} || 0);
% }
%
% if ( $row->{total} ) {
@@ -107,6 +120,12 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
<% $money_sprintf->( $row->{exempt_monthly} ) %>
+% # credited sales
+ Non-taxable
Non-taxable
Non-taxable
+ Credited
Taxable
+
+ <% $money_sprintf->( $row->{sales_credited} ) %>
+
+
% # taxable sales
">
@@ -131,13 +150,16 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
% # credited tax
−
-
- <% $money_sprintf->( $row->{credit} ) %>
-
+%# currently broken
+ <% $money_sprintf->( $row->{tax_credited} ) %>
+%#
% # net tax due
=
- <% $money_sprintf->( $row->{tax} - $row->{credit} ) %>
+ <% $money_sprintf->( $row->{tax} - $row->{tax_credited} ) %>
+% # tax collected
+
+ <% $money_sprintf->( $row->{tax_paid} ) %>
% $rownum++;
% $prev_row = $row;
@@ -161,6 +183,90 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
% }
+
+<& /elements/table-grid.html &>
+
+
+
+
+ Total credits
+ Applied to
+
+
+
+
+% $rownum = 0;
+% $prev_row = { pkgclass => 'DUMMY PKGCLASS' };
+
+ Taxable sales
+ Tax-exempt sales
+ Taxes
+