X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=bbb3bc199ccf4af34e8bf9ab8c3604c9596ea002;hb=2124062154b8716e2d75264f9a6254b596052df6;hp=124e5d8192732e4b70ce8133738a68b5d185f058;hpb=48ddc2a473201e09daaff99b3dd22d56ebe8f939;p=freeside.git
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
old mode 100755
new mode 100644
index 124e5d819..bbb3bc199
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -14,15 +14,16 @@ TD.sectionhead {
.grid TH { background-color: #cccccc; padding: 0px 3px 2px }
.row0 TD { background-color: #eeeeee; padding: 0px 3px 2px; text-align: right}
.row1 TD { background-color: #ffffff; padding: 0px 3px 2px; text-align: right}
-TD.rowhead { font-weight: bold; text-align: left }
+TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
.bigmath { font-size: large; font-weight: bold; font: sans-serif; text-align: center }
.total { font-style: italic }
+
<& /elements/table-grid.html &>
|
- Sales |
+ Sales |
|
Rate |
|
@@ -32,6 +33,8 @@ TD.rowhead { font-weight: bold; text-align: left }
Tax credited |
|
Net tax due |
+ |
+ Tax collected |
@@ -39,6 +42,7 @@ TD.rowhead { font-weight: bold; text-align: left }
Non-taxable |
Non-taxable |
Non-taxable |
+ Credited |
Taxable |
@@ -71,10 +75,21 @@ TD.rowhead { font-weight: bold; text-align: left }
% } # 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};
+% # 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
-% $rowlink .= ';pkgclass='.$row->{pkgclass}
-% if $params{breakdown}->{pkgclass};
+% if ( $params{breakdown}->{pkgclass} ) {
+% $rowlink .= ';classnum=' . ($row->{pkgclass} || 0);
+% # $rowregion .= ';classnum=' . ($row->{pkgclass} || 0);
+% }
%
% if ( $row->{total} ) {
@@ -106,6 +121,12 @@ TD.rowhead { font-weight: bold; text-align: left }
<% $money_sprintf->( $row->{exempt_monthly} ) %>
+% # credited sales
+
+
+ <% $money_sprintf->( $row->{sales_credited} ) %>
+
+ |
% # taxable sales
">
@@ -130,19 +151,134 @@ TD.rowhead { font-weight: bold; text-align: left }
% # 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;
% } # foreach my $row
+% # at the end of everything
+
+% if ( $report->{out_sales} > 0 ) {
+
+
+
+ <% emt('Out of taxable region') %>
+ |
+
+
+ <% $money_sprintf->( $report->{out_sales } ) %>
+
+ |
+ |
+
+
+% }
+
+<& /elements/table-grid.html &>
+
+
+ |
+ Total credits |
+ Applied to |
+
+
+ Taxable sales |
+ Tax-exempt sales |
+ Taxes |
+
+
+
+% $rownum = 0;
+% $prev_row = { pkgclass => 'DUMMY PKGCLASS' };
+
+
+% # mostly duplicates the stuff above...
+% # but putting it all in one giant table is no good
+% foreach my $row (@rows) {
+% if ( $row->{pkgclass} ne $prev_row->{pkgclass} ) {
+% if ( $rownum > 0 ) { # start a new section
+% $rownum = 0;
+
+% }
+% if ( $params{breakdown}->{pkgclass} ) { # and caption the new section
+
+
+ <% $pkgclass_name{$row->{pkgclass}} %>
+ |
+
+% }
+% } # if $row->{pkgclass} ne ...
+
+% my $rowlink = ';taxnum=' . $row->{taxnums};
+%
+% if ( $row->{total} ) {
+
+% }
+
+ <% $row->{label} |h %> |
+
+% # Total credits
+ <% $money_sprintf->( $row->{credits} ) %>
+ |
+% # 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} ) %>
+
+ |
+% # ... to taxes
+
+%# currently broken
+ <% $money_sprintf->( $row->{tax_credited} ) %>
+%#
+ |
+
+% $rownum++;
+% $prev_row = $row;
+% } # foreach my $row
+% # "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 } ) %>
+
+ |
+ |
+
+
+% }
+
+
+
+
<& /elements/footer.html &>
<%init>
@@ -170,8 +306,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";
}
@@ -193,16 +330,24 @@ 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";
-
+my $salescreditlink = $p. "search/cust_bill_pkg.cgi?$dateagentlink;nottax=1;credit=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/;
+ $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' ) {
+# $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';