X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;fp=httemplate%2Fsearch%2Freport_tax.cgi;h=2b531ea466e2342ae5b82561c38f92b2df9cb46d;hp=0ad143f01e631f6e8820f2038d249dbaabf930d3;hb=294e2ce31d6bbd2784a812d20438f9b223de0490;hpb=3b6d92312c10df349d91999f496ed2539b56c608
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 0ad143f01..2b531ea46 100644
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -18,6 +18,7 @@ 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 &>
@@ -88,7 +89,6 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
% $rowlink .= ';classnum=' . ($row->{pkgclass} || 0);
% $rowregion .= ';classnum=' . ($row->{pkgclass} || 0);
% }
-%warn $rowregion;
%
% if ( $row->{total} ) {
@@ -183,6 +183,90 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
% }
+
+<& /elements/table-grid.html &>
+
+
+ |
+ Total credits |
+ Applied to |
+
+
+ Taxable sales |
+ Tax-exempt sales |
+ Taxes |
+
+
+
+% $rownum = 0;
+% $prev_row = { pkgclass => 'DUMMY PKGCLASS' };
+
+
+% # mostly duplicates the stuff above...
+% # but putting it all in one giant table is no good
+% foreach my $row (@rows) {
+% if ( $row->{pkgclass} ne $prev_row->{pkgclass} ) {
+% if ( $rownum > 0 ) { # start a new section
+% $rownum = 0;
+
+% }
+% if ( $params{breakdown}->{pkgclass} ) { # and caption the new section
+
+
+ <% $pkgclass_name{$row->{pkgclass}} %>
+ |
+
+% }
+% } # if $row->{pkgclass} ne ...
+
+% 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});
+% }
+% }
+% if ( $params{breakdown}->{pkgclass} ) {
+% $rowlink .= ';classnum=' . ($row->{pkgclass} || 0);
+% $rowregion .= ';classnum=' . ($row->{pkgclass} || 0);
+% }
+%
+% if ( $row->{total} ) {
+
+% }
+
+ <% $row->{label} |h %> |
+
+% # Total credits
+ <% $money_sprintf->( $row->{credits} ) %>
+ |
+% # Credits to taxable sales
+
+
+ <% $money_sprintf->( $row->{sales_credited} ) %>
+
+ |
+% # ... to exempt sales (link is the same, it shows both exempt and taxable)
+
+
+ <% $money_sprintf->( $row->{exempt_credited} ) %>
+
+ |
+% # ... to taxes
+
+%# currently broken
+ <% $money_sprintf->( $row->{tax_credited} ) %>
+%#
+ |
+
+% $rownum++;
+% $prev_row = $row;
+% } # foreach my $row
+% # no "out of taxable region" for credits (yet)
+
+
+
+
<& /elements/footer.html &>
<%init>