X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=bbb3bc199ccf4af34e8bf9ab8c3604c9596ea002;hb=83a9d7e9afedfa270dcdf942df04fb50989afc4f;hp=2b531ea466e2342ae5b82561c38f92b2df9cb46d;hpb=294e2ce31d6bbd2784a812d20438f9b223de0490;p=freeside.git
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 2b531ea46..bbb3bc199 100644
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -78,16 +78,17 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
% # 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});
-% }
-% }
+% # DON'T EVER USE THIS
+% # 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);
+% # $rowregion .= ';classnum=' . ($row->{pkgclass} || 0);
% }
%
% if ( $row->{total} ) {
@@ -122,7 +123,7 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
% # credited sales
-
+
<% $money_sprintf->( $row->{sales_credited} ) %>
|
@@ -166,7 +167,7 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
% } # foreach my $row
% # at the end of everything
-% if ( $report->{outside} > 0 ) {
+% if ( $report->{out_sales} > 0 ) {
@@ -174,7 +175,7 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
|
- <% $money_sprintf->( $report->{outside } ) %>
+ <% $money_sprintf->( $report->{out_sales } ) %>
|
|
@@ -220,16 +221,6 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
% } # 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} ) {
@@ -242,13 +233,13 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
% # 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} ) %>
|
@@ -262,7 +253,28 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
% $rownum++;
% $prev_row = $row;
% } # foreach my $row
-% # no "out of taxable region" for credits (yet)
+% # "out of taxable region" for credits (there is a need for it)
+% if ( $report->{out_credit} > 0 ) {
+% my $creditlink = "cust_credit_bill_pkg.html?out=1;$dateagentlink";
+% if ( $params{'credit_date'} eq 'cust_credit_bill' ) {
+% $creditlink =~ s/begin/credit_begin/;
+% $creditlink =~ s/end/credit_end/;
+% }
+% $creditlink .= ";taxname=" . encode_entities($params{'taxname'});
+
+
+
+ <% emt('Out of taxable region') %>
+ |
+
+
+ <% $money_sprintf->( $report->{out_credit } ) %>
+
+ |
+ |
+
+
+% }
@@ -324,10 +336,11 @@ if ( $params{agentnum} ) {
my $saleslink = $p. "search/cust_bill_pkg.cgi?$dateagentlink;nottax=1";
my $taxlink = $p. "search/cust_bill_pkg.cgi?$dateagentlink;istax=1";
my $exemptlink = $p. "search/cust_tax_exempt_pkg.cgi?$dateagentlink";
-my $salescreditlink = $p. "search/cust_credit_bill_pkg.html?$dateagentlink;nottax=1";
+my $salescreditlink = $p. "search/cust_bill_pkg.cgi?$dateagentlink;nottax=1;credit=1";
if ( $params{'credit_date'} eq 'cust_credit_bill' ) {
$salescreditlink =~ s/begin/credit_begin/;
$salescreditlink =~ s/end/credit_end/;
+ $saleslink .= ";credit_begin=$beginning;credit_end=$ending";
}
#my $creditlink = $p. "search/cust_bill_pkg.cgi?$dateagentlink;credit=1;istax=1";
#if ( $params{'credit_date'} eq 'cust_credit_bill' ) {