X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=1d906473edf2c6e9ac9cdd1ba30a7f815b4be353;hb=c0c5709fb022b83a482d0b35f7094505766d5868;hp=3e9d7653a4c9ef07aa18a08a1ad2f242b2c35d70;hpb=bee4494248009b7b998391bc68c5d10a31220057;p=freeside.git
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 3e9d7653a..1d906473e 100644
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -32,6 +32,8 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
Tax credited |
|
Net tax due |
+ |
+ Tax collected |
@@ -73,8 +75,9 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
% # construct base links that limit to the tax rates described by this row
% my $rowlink = ';taxnum=' . $row->{taxnums};
% # and also the package class, if we're limiting package class
-% $rowlink .= ';pkgclass='.$row->{pkgclass}
-% if $params{breakdown}->{pkgclass};
+% if ( $params{breakdown}->{pkgclass} ) {
+% $rowlink .= ';classnum=' . ($row->{pkgclass} || 0);
+% }
%
% if ( $row->{total} ) {
@@ -130,13 +133,16 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
% # credited tax
− |
-
+%# currently broken
<% $money_sprintf->( $row->{credit} ) %>
-
+%#
|
% # net tax due
= |
<% $money_sprintf->( $row->{tax} - $row->{credit} ) %> |
+% # tax collected
+ |
+ <% $money_sprintf->( $row->{tax_paid} ) %> |
% $rownum++;
% $prev_row = $row;
@@ -150,7 +156,7 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
<% emt('Out of taxable region') %>
-
+
<% $money_sprintf->( $report->{outside } ) %>
|
@@ -187,8 +193,9 @@ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
$agentname = $agent->agentname;
}
-if ( $cgi->param('taxname') =~ /^([\w ]+)$/ ) {
- $params{taxname} = $1;
+# allow anything in here; FS::Report::Tax will treat it as unsafe
+if ( length($cgi->param('taxname')) ) {
+ $params{taxname} = $cgi->param('taxname');
} else {
die "taxname required";
}
@@ -210,16 +217,18 @@ my $money_sprintf = sub {
};
my $dateagentlink = "begin=$beginning;end=$ending";
-$dateagentlink .= $params{agentnum} if $params{agentnum};
+if ( $params{agentnum} ) {
+ $dateagentlink .= ';agentnum=' . $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 $creditlink = $p. "search/cust_bill_pkg.cgi?$dateagentlink;credit=1;istax=1";
-
-if ( $params{'credit_date'} eq 'cust_credit_bill' ) {
- $creditlink =~ s/begin/credit_begin/;
- $creditlink =~ s/end/credit_end/;
-}
+#my $creditlink = $p. "search/cust_bill_pkg.cgi?$dateagentlink;credit=1;istax=1";
+#if ( $params{'credit_date'} eq 'cust_credit_bill' ) {
+# $creditlink =~ s/begin/credit_begin/;
+# $creditlink =~ s/end/credit_end/;
+#}
+my $creditlink = ''; # disabled until we find a sane way to do this
my %pkgclass_name = map { $_->classnum, $_->classname } qsearch('pkg_class');
$pkgclass_name{''} = 'Unclassified';