diff options
author | ivan <ivan> | 2008-11-02 20:03:31 +0000 |
---|---|---|
committer | ivan <ivan> | 2008-11-02 20:03:31 +0000 |
commit | 80ffb3401777a589be6f7eb5dd0a0b7cb23d3964 (patch) | |
tree | 4828cea273c91425bb1e9fd5160e0511fe693ac8 /httemplate/search/report_tax.cgi | |
parent | 78eaeff1d9e82316295ab54592d681d2f49b3819 (diff) |
(and fix the line-item links too, whew) fix overreporting of tax invoiced when using & reporting with taxclasses, RT#4131
Diffstat (limited to 'httemplate/search/report_tax.cgi')
-rwxr-xr-x | httemplate/search/report_tax.cgi | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi index 62a3645db..43dedc834 100755 --- a/httemplate/search/report_tax.cgi +++ b/httemplate/search/report_tax.cgi @@ -492,8 +492,16 @@ if ( $cgi->param('show_taxclasses') ) { my $base_label = getlabel($r, 'no_taxclass'=>1 ); $base_regions{$base_label}->{'label'} = $base_label; + $base_regions{$base_label}->{'url_param'} = - join(';', map "$_=".$r->$_(), qw( county state country ) ); + join(';', map "$_=".$r->$_(), qw( county state country ) ); #taxname??? + + if ( $r->taxclass ) { + $base_regions{$base_label}->{'url_param'} .= ';taxclass='. $r->taxclass; + } else { + $base_regions{$base_label}->{'url_param'} .= ';taxclassNULL=1' + } + $base_regions{$base_label}->{'tax'} += $x; $tax += $x; } |