projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7fd91ef
)
fix total line links on tax report when using report_group kludge? (possibly not...
author
ivan
<ivan>
Wed, 27 May 2009 21:27:34 +0000
(21:27 +0000)
committer
ivan
<ivan>
Wed, 27 May 2009 21:27:34 +0000
(21:27 +0000)
httemplate/search/report_tax.cgi
patch
|
blob
|
history
diff --git
a/httemplate/search/report_tax.cgi
b/httemplate/search/report_tax.cgi
index
1d4d8d5
..
d17adb9
100755
(executable)
--- a/
httemplate/search/report_tax.cgi
+++ b/
httemplate/search/report_tax.cgi
@@
-275,7
+275,6
@@
if ( $conf->exists('tax-pkg_address') ) {
my $out = 'Out of taxable region(s)';
my %regions = ();
my $out = 'Out of taxable region(s)';
my %regions = ();
-my %taxclasses = ();
foreach my $r ( qsearch({ 'table' => 'cust_main_county',
'extra_sql' => $gotcust,
foreach my $r ( qsearch({ 'table' => 'cust_main_county',
'extra_sql' => $gotcust,
@@
-301,7
+300,7
@@
foreach my $r ( qsearch({ 'table' => 'cust_main_county',
$regions{$label}->{'url_param'} .= ';taxclass='. uri_escape($r->taxclass);
#no, always# if $cgi->param('show_taxclasses');
$regions{$label}->{'url_param'} .= ';taxclass='. uri_escape($r->taxclass);
#no, always# if $cgi->param('show_taxclasses');
- $
taxclasses{$r->taxclass} = 1
;
+ $
regions{$label}->{'taxclass'} = $r->taxclass
;
} else {
} else {
@@
-529,20
+528,10
@@
my @regions = keys %regions;
@regions = grep &{$group_test}($_), @regions
if $group_op;
@regions = grep &{$group_test}($_), @regions
if $group_op;
-#ordering
-@regions =
- map $regions{$_},
- sort { ( ($a eq $out) cmp ($b eq $out) ) || ($b cmp $a) }
- @regions;
-
-my @base_regions =
- map $base_regions{$_},
- sort { ( ($a eq $out) cmp ($b eq $out) ) || ($b cmp $a) }
- keys %base_regions;
-
-#totals
+#calculate totals
my( $total, $tot_taxable, $tot_owed ) = ( 0, 0, 0 );
my( $exempt_cust, $exempt_pkg, $exempt_monthly ) = ( 0, 0, 0 );
my( $total, $tot_taxable, $tot_owed ) = ( 0, 0, 0 );
my( $exempt_cust, $exempt_pkg, $exempt_monthly ) = ( 0, 0, 0 );
+my %taxclasses = ();
foreach (@regions) {
$total += $regions{$_}->{'total'};
$tot_taxable += $regions{$_}->{'taxable'};
foreach (@regions) {
$total += $regions{$_}->{'total'};
$tot_taxable += $regions{$_}->{'taxable'};
@@
-550,15
+539,28
@@
foreach (@regions) {
$exempt_cust += $regions{$_}->{'exempt_cust'};
$exempt_pkg += $regions{$_}->{'exempt_pkg'};
$exempt_monthly += $regions{$_}->{'exempt_monthly'};
$exempt_cust += $regions{$_}->{'exempt_cust'};
$exempt_pkg += $regions{$_}->{'exempt_pkg'};
$exempt_monthly += $regions{$_}->{'exempt_monthly'};
+ $taxclasses{$regions{$_}->{'taxclass'}} = 1
+ if $regions{$_}->{'taxclass'};
}
my $total_url_param = '';
}
my $total_url_param = '';
-
if ( $group_op ) {
$total_url_param = 'report_group='.uri_escape("$group_op $group_value").';'.
if ( $group_op ) {
$total_url_param = 'report_group='.uri_escape("$group_op $group_value").';'.
- join(';', 'taxclass
=
'.dbh->quote($_), keys %taxclasses );
+ join(';', 'taxclass
=
'.dbh->quote($_), keys %taxclasses );
}
}
+#ordering
+@regions =
+ map $regions{$_},
+ sort { ( ($a eq $out) cmp ($b eq $out) ) || ($b cmp $a) }
+ @regions;
+
+my @base_regions =
+ map $base_regions{$_},
+ sort { ( ($a eq $out) cmp ($b eq $out) ) || ($b cmp $a) }
+ keys %base_regions;
+
+#add total line
push @regions, {
'label' => 'Total',
'url_param' => $total_url_param,
push @regions, {
'label' => 'Total',
'url_param' => $total_url_param,