projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a3e7369
)
and the "tax invoiced" link too! woo, working, RT#5446
author
ivan
<ivan>
Wed, 27 May 2009 22:23:44 +0000
(22:23 +0000)
committer
ivan
<ivan>
Wed, 27 May 2009 22:23:44 +0000
(22:23 +0000)
httemplate/search/report_tax.cgi
patch
|
blob
|
history
diff --git
a/httemplate/search/report_tax.cgi
b/httemplate/search/report_tax.cgi
index
1a94163
..
bcceaf1
100755
(executable)
--- a/
httemplate/search/report_tax.cgi
+++ b/
httemplate/search/report_tax.cgi
@@
-110,8
+110,12
@@
</TD>
% unless ( $cgi->param('show_taxclasses') ) {
</TD>
% unless ( $cgi->param('show_taxclasses') ) {
+% my $invlink = $region->{'url_param_inv'}
+% ? ';'. $region->{'url_param_inv'}
+% : $link;
+
<<%$tdh%> ALIGN="right">
<<%$tdh%> ALIGN="right">
- <A HREF="<% $baselink. $link %>;istax=1"
+ <A HREF="<% $baselink. $
inv
link %>;istax=1"
><% &$money_sprintf( $region->{'tax'} ) %></A>
</TD>
% }
><% &$money_sprintf( $region->{'tax'} ) %></A>
</TD>
% }
@@
-553,6
+557,7
@@
foreach (@regions) {
}
my $total_url_param = '';
}
my $total_url_param = '';
+my $total_url_param_invoiced = '';
if ( $group_op ) {
my @country = keys %country;
if ( $group_op ) {
my @country = keys %country;
@@
-565,13
+570,13
@@
if ( $group_op ) {
if scalar(@state) > 1;
my $state = $state[0];
if scalar(@state) > 1;
my $state = $state[0];
+ $total_url_param_invoiced =
$total_url_param =
'report_group='.uri_escape("$group_op $group_value").';'.
$total_url_param =
'report_group='.uri_escape("$group_op $group_value").';'.
- join(';', map 'taxclass='.uri_escape($_), keys %taxclasses ).';'.
+ join(';', map 'taxclass='.uri_escape($_), keys %taxclasses );
+ $total_url_param .= ';'.
"country=$country;state=".uri_escape($state).';'.
"country=$country;state=".uri_escape($state).';'.
- join(';', map 'county='.uri_escape($_), keys %county )
- ;
-
+ join(';', map 'county='.uri_escape($_), keys %county ) ;
}
}
@@
-590,6
+595,7
@@
my @base_regions =
push @regions, {
'label' => 'Total',
'url_param' => $total_url_param,
push @regions, {
'label' => 'Total',
'url_param' => $total_url_param,
+ 'url_param_inv' => $total_url_param_invoiced,
'total' => $total,
'exempt_cust' => $exempt_cust,
'exempt_pkg' => $exempt_pkg,
'total' => $total,
'exempt_cust' => $exempt_cust,
'exempt_pkg' => $exempt_pkg,