diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/search/cust_tax_exempt_pkg.cgi | 6 | ||||
| -rw-r--r-- | httemplate/search/report_tax.cgi | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/httemplate/search/cust_tax_exempt_pkg.cgi b/httemplate/search/cust_tax_exempt_pkg.cgi index 40b9ed78f..267c9383a 100644 --- a/httemplate/search/cust_tax_exempt_pkg.cgi +++ b/httemplate/search/cust_tax_exempt_pkg.cgi @@ -118,6 +118,12 @@ if ( $cgi->param('custnum') =~ /^(\d+)$/ ) { push @where, "cust_main.custnum = $1"; } +if ( $cgi->param('classnum') eq '0' ) { + push @where, "part_pkg.classnum IS NULL"; +} elsif ( $cgi->param('classnum') =~ /^(\d+)$/ ) { + push @where, "part_pkg.classnum = $1"; +} + if ( $cgi->param('out') ) { # wtf? how would you ever get exemptions on a non-taxable package location? diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi index 3e9d7653a..83f2fc5d3 100644 --- a/httemplate/search/report_tax.cgi +++ b/httemplate/search/report_tax.cgi @@ -73,8 +73,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} ) { </TBODY><TBODY CLASS="total"> @@ -210,7 +211,9 @@ 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"; |