X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=479b990442e957a3b3777cecd04fcd1d443348f2;hb=63973c641c4be00765fa27e55c57cc5b9aa4da19;hp=dd6779a617ef78f980ce575a7dde1e2860b00b38;hpb=4783789db90ba00a0e57077464c689bd082ffb0f;p=freeside.git
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index dd6779a61..479b99044 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -1,4 +1,4 @@
-<% include("/elements/header.html", "$agentname Sales Tax Report - ".
+<% include("/elements/header.html", "$agentname Tax Report - ".
( $beginning
? time2str('%h %o %Y ', $beginning )
: ''
@@ -10,216 +10,273 @@
)
)
%>
+
+Download full results
+as Excel spreadsheet
+ |
<% include('/elements/table-grid.html') %>
- |
+ |
Sales |
- |
- Rate |
- |
- Tax owed |
+ |
+ Rate |
+ |
+ Tax owed |
% unless ( $cgi->param('show_taxclasses') ) {
-
- Tax invoiced |
+ Tax invoiced |
+ |
+ Tax credited |
+ |
+ Tax collected |
% }
+
+
+ Total |
+ |
+ Non-taxable |
+ |
+ Non-taxable |
+ |
+ Non-taxable |
+ |
+ Taxable |
+
- Total |
- |
- Non-taxable (tax-exempt customer) |
- |
- Non-taxable (tax-exempt package) |
- |
- Non-taxable (monthly exemption) |
- |
- Taxable |
+ (tax-exempt customer) |
+ (tax-exempt package) |
+ (monthly exemption) |
+
% my $bgcolor1 = '#eeeeee';
-% my $bgcolor2 = '#ffffff';
-% my $bgcolor;
+% my $bgcolor2 = '#ffffff';
+% my $bgcolor;
%
% foreach my $region ( @regions ) {
%
-% if ( $bgcolor eq $bgcolor1 ) {
-% $bgcolor = $bgcolor2;
-% } else {
-% $bgcolor = $bgcolor1;
-% }
-%
-% my $link = '';
-% if ( $region->{'label'} ne 'Total' ) {
-% if ( $region->{'label'} eq $out ) {
-% $link = ';out=1';
-% } else {
-% $link = ';'. $region->{'url_param'};
-% }
-% }
+% my $link = '';
+% if ( $region->{'label'} eq $out ) {
+% $link = ';out=1';
+% } elsif ( $region->{'taxnums'} ) {
+% # might be nicer to specify this as country:state:city
+% $link = ';'.join(';', map { "taxnum=$_" } @{ $region->{'taxnums'} });
+% }
%
+% if ( $bgcolor eq $bgcolor1 ) {
+% $bgcolor = $bgcolor2;
+% } else {
+% $bgcolor = $bgcolor1;
+% }
%
+% my $hicolor = $bgcolor;
+% unless ( $cgi->param('show_taxclasses') ) {
+% my $diff = abs( sprintf( '%.2f', $region->{'owed'} )
+% - sprintf( '%.2f', $region->{'tax'} )
+% );
+% if ( $diff > 0.02 ) {
+% $hicolor = $hicolor eq '#eeeeee' ? '#eeee99' : '#ffffcc';
+% }
+% }
%
%
-%
-
+% my $td = qq(TD CLASS="grid" BGCOLOR="$bgcolor");
+% my $tdh = qq(TD CLASS="grid" BGCOLOR="$hicolor");
+% my $bigmath = '';
+% my $bme = '';
- <% $region->{'label'} %> |
-
- <% $money_char %><% sprintf('%.2f', $region->{'total'} ) %>
+ <<%$td%>><% $region->{'label'} %> |
+ <<%$td%> ALIGN="right">
+ <% &$money_sprintf( $region->{'sales'} ) %>
- - |
-
- <% $money_char %><% sprintf('%.2f', $region->{'exempt_cust'} ) %>
+% if ( $region->{'label'} eq $out ) {
+ <<%$td%> COLSPAN=12> |
+% } else { #not $out
+ <<%$td%>> -
+ <<%$td%> ALIGN="right">
+ <% &$money_sprintf( $region->{'exempt_cust'} ) %>
- - |
-
- <% $money_char %><% sprintf('%.2f', $region->{'exempt_pkg'} ) %>
+ <<%$td%>> - |
+ <<%$td%> ALIGN="right">
+ <% &$money_sprintf( $region->{'exempt_pkg'} ) %>
- - |
-
- <% $money_char %><% sprintf('%.2f', $region->{'exempt_monthly'} ) %>
+ <<%$td%>> - |
+ <<%$td%> ALIGN="right">
+ <% &$money_sprintf( $region->{'exempt_monthly'} ) %>
- = |
-
- <% $money_char %><% sprintf('%.2f', $region->{'taxable'} ) %>
+ <<%$td%>> = |
+ <<%$td%> ALIGN="right">
+ <% &$money_sprintf( $region->{'taxable'} ) %>
- <% $region->{'label'} eq 'Total' ? '' : ' X ' %> |
- <% $region->{'rate'} %> |
- <% $region->{'label'} eq 'Total' ? '' : ' = ' %> |
-
- <% $money_char %><% sprintf('%.2f', $region->{'owed'} ) %>
+ <<%$td%>><% $region->{'label'} eq 'Total' ? '' : "$bigmath X $bme" %> |
+ <<%$td%> ALIGN="right"><% $region->{'rate'} %>
+ <<%$td%>><% $region->{'label'} eq 'Total' ? '' : "$bigmath = $bme" %>
+ <<%$tdh%> ALIGN="right">
+ <% &$money_sprintf( $region->{'owed'} ) %>
-% unless ( $cgi->param('show_taxclasses') ) {
-
-
- <% $money_char %><% sprintf('%.2f', $region->{'tax'} ) %>
+% } # if !$out
+% unless ( $cgi->param('show_taxclasses') ) {
+% my $invlink = $region->{'url_param_inv'}
+% ? ';'. $region->{'url_param_inv'}
+% : $link;
+
+% if ( $region->{'label'} eq $out ) {
+ <<%$td%> ALIGN="right">
+ <% &$money_sprintf_nonzero( $region->{'tax'} ) %>
|
-% }
+ <<%$td%>>
+ <<%$td%> ALIGN="right">
+ <% &$money_sprintf_nonzero( $region->{'credit'} ) %>
+
+ <<%$td%> COLSPAN=2>
+% } else { #not $out
+ <<%$tdh%> ALIGN="right">
+ <% &$money_sprintf( $region->{'tax'} ) %>
+
+ <<%$tdh%>> -
+ <<%$tdh%> ALIGN="right">
+ <% &$money_sprintf( $region->{'credit'} ) %>
+
+ <<%$tdh%>> =
+ <<%$tdh%> ALIGN="right">
+ <% &$money_sprintf( $region->{'tax'} - $region->{'credit'} ) %>
+
+% }
+% } # not $out
% }
-
-% if ( $cgi->param('show_taxclasses') ) {
-
-
-
- <% include('/elements/table-grid.html') %>
-
- |
- Tax invoiced |
-
-% #some false laziness w/above
-% $bgcolor1 = '#eeeeee';
-% $bgcolor2 = '#ffffff';
-% foreach my $region ( @base_regions ) {
-%
-% if ( $bgcolor eq $bgcolor1 ) {
-% $bgcolor = $bgcolor2;
-% } else {
-% $bgcolor = $bgcolor1;
-% }
-%
-% my $link = '';
-% #if ( $region->{'label'} ne 'Total' ) {
-% if ( $region->{'label'} eq $out ) {
-% $link = ';out=1';
-% } else {
-% $link = ';'. $region->{'url_param'};
-% }
-% #}
-%
+% if ( $cgi->param('show_taxclasses') ) {
+
+ <% include('/elements/table-grid.html') %>
- <% $region->{'label'} %> |
-
- <% $money_char %><% sprintf('%.2f', $region->{'tax'} ) %>
- |
+ |
+ Tax invoiced |
+ |
+ Tax credited |
+ |
+ Tax collected |
-% }
+
+% #some false laziness w/above
+% $bgcolor1 = '#eeeeee';
+% $bgcolor2 = '#ffffff';
+%
+% foreach my $region ( @base_regions ) {
+%
+% my $link = '';
+% if ( $region->{'label'} eq $out ) {
+% $link = ';out=1';
+% } else {
+% $link = ';'. $region->{'url_param'}
+% if $region->{'url_param'};
+% }
%
% if ( $bgcolor eq $bgcolor1 ) {
% $bgcolor = $bgcolor2;
% } else {
% $bgcolor = $bgcolor1;
% }
-%
-
-
-
- Total |
-
- <% $money_char %><% sprintf('%.2f', $tax ) %>
- |
-
+% my $td = qq(TD CLASS="grid" BGCOLOR="$bgcolor");
+% my $tdh = qq(TD CLASS="grid" BGCOLOR="$bgcolor");
+%
+% #?
+% my $invlink = $region->{'url_param_inv'}
+% ? ';'. $region->{'url_param_inv'}
+% : $link;
+
+
+ <<%$td%>><% $region->{'label'} %>
+% if ( $region->{'label'} eq $out ) {
+ <<%$td%> ALIGN="right">
+ <% &$money_sprintf_nonzero( $region->{'tax'} ) %>
+
+ <<%$td%>>
+ <<%$td%> ALIGN="right">
+ <% &$money_sprintf_nonzero( $region->{'credit'} ) %>
+
+ <<%$td%> COLSPAN=2>
+% } else { #not $out
+ <<%$td%> ALIGN="right">
+ <% &$money_sprintf( $region->{'tax'} ) %>
+
+ <<%$td%>> -
+ <<%$tdh%> ALIGN="right">
+ <% &$money_sprintf( $region->{'credit'} ) %>
+
+ <<%$td%>> =
+ <<%$tdh%> ALIGN="right">
+ <% &$money_sprintf( $region->{'tax'} - $region->{'credit'} ) %>
+
+
+% } # if $out
+% } #foreach $region
-% }
+% } # if show_taxclasses
+
+<% include('/elements/footer.html') %>
-