X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=inline;f=httemplate%2Fsearch%2Freport_tax.cgi;h=0ad143f01e631f6e8820f2038d249dbaabf930d3;hb=323d6a0c3ee3d7752225b712f5bdcfbb1581d61f;hp=83f2fc5d3f889a4d05adf75fff58a55cd01d0182;hpb=fa0223015fe6c03491b1d0d43524e03ac5fdb899;p=freeside.git
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 83f2fc5d3..0ad143f01 100644
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -22,7 +22,7 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
|
- Sales |
+ Sales |
|
Rate |
|
@@ -32,6 +32,8 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
Tax credited |
|
Net tax due |
+ |
+ Tax collected |
@@ -39,6 +41,7 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
Non-taxable |
Non-taxable |
Non-taxable |
+ Credited |
Taxable |
@@ -71,11 +74,21 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
% } # if $row->{pkgclass} ne ...
% # construct base links that limit to the tax rates described by this row
+% # 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});
+% }
+% }
% # 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);
% }
+%warn $rowregion;
%
% if ( $row->{total} ) {
@@ -107,6 +120,12 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
<% $money_sprintf->( $row->{exempt_monthly} ) %>
+% # credited sales
+
+
+ <% $money_sprintf->( $row->{sales_credited} ) %>
+
+ |
% # taxable sales
">
@@ -131,13 +150,16 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
% # credited tax
| − |
-
- <% $money_sprintf->( $row->{credit} ) %>
-
+%# currently broken
+ <% $money_sprintf->( $row->{tax_credited} ) %>
+%#
|
% # net tax due
= |
- <% $money_sprintf->( $row->{tax} - $row->{credit} ) %> |
+ <% $money_sprintf->( $row->{tax} - $row->{tax_credited} ) %> |
+% # tax collected
+ |
+ <% $money_sprintf->( $row->{tax_paid} ) %> |
% $rownum++;
% $prev_row = $row;
@@ -151,7 +173,7 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
<% emt('Out of taxable region') %>
-
+
<% $money_sprintf->( $report->{outside } ) %>
|
@@ -188,8 +210,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";
}
@@ -217,12 +240,17 @@ 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 $creditlink = $p. "search/cust_bill_pkg.cgi?$dateagentlink;credit=1;istax=1";
-
+my $salescreditlink = $p. "search/cust_credit_bill_pkg.html?$dateagentlink;nottax=1";
if ( $params{'credit_date'} eq 'cust_credit_bill' ) {
- $creditlink =~ s/begin/credit_begin/;
- $creditlink =~ s/end/credit_end/;
+ $salescreditlink =~ s/begin/credit_begin/;
+ $salescreditlink =~ 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';