X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fsearch%2Freport_tax.cgi;h=7eb07cf3ce08f47764f36f30bf02d144c856d1cd;hb=6c4d9632f4d5cd1164ab9183932fbdf9137945aa;hp=e97480540151180b85da6ac8fa14f61fc083992b;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1;p=freeside.git
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index e97480540..7eb07cf3c 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -7,8 +7,7 @@
( $ending == 4294967295
? 'now'
: time2str('%h %o %Y', $ending )
- ),
- menubar( 'Main Menu'=>$p, )
+ )
)
%>
@@ -22,11 +21,10 @@
|
Tax owed |
% unless ( $cgi->param('show_taxclasses') ) {
-
Tax invoiced |
% }
-
+
Total |
|
@@ -38,267 +36,247 @@
|
Taxable |
+
% 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'} ne 'Total' ) {
+% if ( $region->{'label'} eq $out ) {
+% $link = ';out=1';
+% } else {
+% $link = ';'. $region->{'url_param'};
+% }
+% }
%
+% if ( $bgcolor eq $bgcolor1 ) {
+% $bgcolor = $bgcolor2;
+% } else {
+% $bgcolor = $bgcolor1;
+% }
%
-%
-
+% my $td = qq(TD CLASS="grid" BGCOLOR="$bgcolor");
+% my $bigmath = '';
+% my $bme = '';
- <% $region->{'label'} %> |
-
- <% $money_char %><% sprintf('%.2f', $region->{'total'} ) %>
+ <<%$td%>><% $region->{'label'} %> |
+ <<%$td%> ALIGN="right">
+ <% &$money_sprintf( $region->{'total'} ) %>
- - |
-
- <% $money_char %><% sprintf('%.2f', $region->{'exempt_cust'} ) %>
+ <<%$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" %>
+ <<%$td%> ALIGN="right">
+ <% &$money_sprintf( $region->{'owed'} ) %>
-% unless ( $cgi->param('show_taxclasses') ) {
-
- <% $money_char %><% sprintf('%.2f', $region->{'tax'} ) %>
+% unless ( $cgi->param('show_taxclasses') ) {
+ <<%$td%> ALIGN="right">
+ <% &$money_sprintf( $region->{'tax'} ) %>
|
% }
% }
-
-% if ( $cgi->param('show_taxclasses') ) {
+% 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 ) {
+
+ <% 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;
+% my $link = '';
+% #if ( $region->{'label'} ne 'Total' ) {
+% if ( $region->{'label'} eq $out ) {
+% $link = ';out=1';
% } else {
-% $bgcolor = $bgcolor1;
+% $link = ';'. $region->{'url_param'};
% }
-%
-% my $link = '';
-% #if ( $region->{'label'} ne 'Total' ) {
-% if ( $region->{'label'} eq $out ) {
-% $link = ';out=1';
-% } else {
-% $link = ';'. $region->{'url_param'};
-% }
-% #}
-%
-
-
-
- <% $region->{'label'} %> |
-
- <% $money_char %><% sprintf('%.2f', $region->{'tax'} ) %>
- |
-
-% }
+% #}
%
% if ( $bgcolor eq $bgcolor1 ) {
% $bgcolor = $bgcolor2;
% } else {
% $bgcolor = $bgcolor1;
% }
-%
+% my $td = qq(TD CLASS="grid" BGCOLOR="$bgcolor");
+
+ <<%$td%>><% $region->{'label'} %>
+ <<%$td%> ALIGN="right">
+ <% &$money_sprintf( $region->{'tax'} ) %>
+
+
+
+% }
+
+% if ( $bgcolor eq $bgcolor1 ) {
+% $bgcolor = $bgcolor2;
+% } else {
+% $bgcolor = $bgcolor1;
+% }
+% my $td = qq(TD CLASS="grid" BGCOLOR="$bgcolor");
- Total |
-
- <% $money_char %><% sprintf('%.2f', $tax ) %>
- |
+ <<%$td%>>Total
+ <<%$td%> ALIGN="right">
+ <% &$money_sprintf( $tax ) %>
+
+
% }
+<% include('/elements/footer.html') %>
-