X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=e89c66536c2037ad2d736db4c4875a75d58bf5ec;hb=74cb9e1c3974d8899bf9745564d0dfce5875454c;hp=eddb3da00fb37e9253b4971f8fb2874cf8703b56;hpb=b91bcdff200acb281c58c4ba5ef8482b335ecdbc;p=freeside.git diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi index eddb3da00..e89c66536 100755 --- a/httemplate/search/report_tax.cgi +++ b/httemplate/search/report_tax.cgi @@ -1,4 +1,4 @@ -<% include("/elements/header.html", "$agentname Sales Tax Report - ". +<% include("/elements/header.html", "$agentname Tax Report - ". ( $beginning ? time2str('%h %o %Y ', $beginning ) : '' @@ -7,8 +7,7 @@ ( $ending == 4294967295 ? 'now' : time2str('%h %o %Y', $ending ) - ), - menubar( 'Main Menu'=>$p, ) + ) ) %> @@ -22,11 +21,10 @@ Tax owed % unless ( $cgi->param('show_taxclasses') ) { - Tax invoiced % } - + Total @@ -38,188 +36,181 @@ Taxable + % my $bgcolor1 = '#eeeeee'; -% my $bgcolor2 = '#ffffff'; -% my $bgcolor; +% my $bgcolor2 = '#ffffff'; +% my $bgcolor; % % foreach my $region ( @regions ) { % -% if ( $bgcolor eq $bgcolor1 ) { -% $bgcolor = $bgcolor2; -% } else { -% $bgcolor = $bgcolor1; -% } -% -% my $link = ''; -% if ( $region->{'label'} ne 'Total' ) { -% if ( $region->{'label'} eq $out ) { -% $link = ';out=1'; -% } else { -% $link = ';'. $region->{'url_param'}; -% } -% } +% my $link = ''; +% if ( $region->{'label'} eq $out ) { +% $link = ';out=1'; +% } else { +% $link = ';'. $region->{'url_param'} +% if $region->{'url_param'}; +% } % +% if ( $bgcolor eq $bgcolor1 ) { +% $bgcolor = $bgcolor2; +% } else { +% $bgcolor = $bgcolor1; +% } % +% #my $diff = 0; +% my $hicolor = $bgcolor; +% unless ( $cgi->param('show_taxclasses') ) { +% my $diff = abs( sprintf( '%.2f', $region->{'owed'} ) +% - sprintf( '%.2f', $region->{'tax'} ) +% ); +% if ( $diff > 0.02 ) { +% # $hicolor = $hicolor eq '#eeeeee' ? '#eeee66' : '#ffff99'; +% #} elsif ( $diff ) { +% $hicolor = $hicolor eq '#eeeeee' ? '#eeee99' : '#ffffcc'; +% } +% } % % -% - +% my $td = qq(TD CLASS="grid" BGCOLOR="$bgcolor"); +% my $tdh = qq(TD CLASS="grid" BGCOLOR="$hicolor"); +% my $bigmath = ''; +% my $bme = ''; - <% $region->{'label'} %> - - <% $money_char %><% sprintf('%.2f', $region->{'total'} ) %> + <<%$td%>><% $region->{'label'} %> + <<%$td%> ALIGN="right"> + <% &$money_sprintf( $region->{'total'} ) %> - - - - <% $money_char %><% sprintf('%.2f', $region->{'exempt_cust'} ) %> + <<%$td%>> - + <<%$td%> ALIGN="right"> + <% &$money_sprintf( $region->{'exempt_cust'} ) %> - - - - <% $money_char %><% sprintf('%.2f', $region->{'exempt_pkg'} ) %> + <<%$td%>> - + <<%$td%> ALIGN="right"> + <% &$money_sprintf( $region->{'exempt_pkg'} ) %> - - - - <% $money_char %><% sprintf('%.2f', $region->{'exempt_monthly'} ) %> + <<%$td%>> - + <<%$td%> ALIGN="right"> + <% &$money_sprintf( $region->{'exempt_monthly'} ) %> - = - - <% $money_char %><% sprintf('%.2f', $region->{'taxable'} ) %> + <<%$td%>> = + <<%$td%> ALIGN="right"> + <% &$money_sprintf( $region->{'taxable'} ) %> - <% $region->{'label'} eq 'Total' ? '' : ' X ' %> - <% $region->{'rate'} %> - <% $region->{'label'} eq 'Total' ? '' : ' = ' %> - - <% $money_char %><% sprintf('%.2f', $region->{'owed'} ) %> + <<%$td%>><% $region->{'label'} eq 'Total' ? '' : "$bigmath X $bme" %> + <<%$td%> ALIGN="right"><% $region->{'rate'} %> + <<%$td%>><% $region->{'label'} eq 'Total' ? '' : "$bigmath = $bme" %> + <<%$tdh%> ALIGN="right"> + <% &$money_sprintf( $region->{'owed'} ) %> + % unless ( $cgi->param('show_taxclasses') ) { +% my $invlink = $region->{'url_param_inv'} +% ? ';'. $region->{'url_param_inv'} +% : $link; - - <% $money_char %><% sprintf('%.2f', $region->{'tax'} ) %> + <<%$tdh%> ALIGN="right"> + <% &$money_sprintf( $region->{'tax'} ) %> % } % } - -% if ( $cgi->param('show_taxclasses') ) { - - -
- <% include('/elements/table-grid.html') %> - - - Tax invoiced - -% #some false laziness w/above -% $bgcolor1 = '#eeeeee'; -% $bgcolor2 = '#ffffff'; -% foreach my $region ( @base_regions ) { -% -% if ( $bgcolor eq $bgcolor1 ) { -% $bgcolor = $bgcolor2; -% } else { -% $bgcolor = $bgcolor1; -% } -% -% my $link = ''; -% #if ( $region->{'label'} ne 'Total' ) { -% if ( $region->{'label'} eq $out ) { -% $link = ';out=1'; -% } else { -% $link = ';'. $region->{'url_param'}; -% } -% #} -% +% if ( $cgi->param('show_taxclasses') ) { +
+ <% include('/elements/table-grid.html') %> - <% $region->{'label'} %> - - <% $money_char %><% sprintf('%.2f', $region->{'tax'} ) %> - + + Tax invoiced -% } + +% #some false laziness w/above +% $bgcolor1 = '#eeeeee'; +% $bgcolor2 = '#ffffff'; +% +% foreach my $region ( @base_regions ) { +% +% my $link = ''; +% if ( $region->{'label'} eq $out ) { +% $link = ';out=1'; +% } else { +% $link = ';'. $region->{'url_param'} +% if $region->{'url_param'}; +% } % % if ( $bgcolor eq $bgcolor1 ) { % $bgcolor = $bgcolor2; % } else { % $bgcolor = $bgcolor1; % } -% +% my $td = qq(TD CLASS="grid" BGCOLOR="$bgcolor"); + + + <<%$td%>><% $region->{'label'} %> + <<%$td%> ALIGN="right"> + <% &$money_sprintf( $region->{'tax'} ) %> + + + +% } +% if ( $bgcolor eq $bgcolor1 ) { +% $bgcolor = $bgcolor2; +% } else { +% $bgcolor = $bgcolor1; +% } +% my $td = qq(TD CLASS="grid" BGCOLOR="$bgcolor"); - Total - - <% $money_char %><% sprintf('%.2f', $tax ) %> - + <<%$td%>>Total + <<%$td%> ALIGN="right"> + <% &$money_sprintf( $tot_tax ) %> + + % } +<% include('/elements/footer.html') %> - - <%init> die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Financial reports'); my $conf = new FS::Conf; -my $money_char = $conf->config('money_char') || '$'; my $user = getotaker; my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi); -my $join_cust = " - JOIN cust_bill USING ( invnum ) - LEFT JOIN cust_main USING ( custnum ) -"; -my $from_join_cust = " - FROM cust_bill_pkg - $join_cust -"; -my $join_pkg = " - LEFT JOIN cust_pkg USING ( pkgnum ) - LEFT JOIN part_pkg USING ( pkgpart ) -"; - -my $where = "WHERE _date >= $beginning AND _date <= $ending "; -my @base_param = qw( county county state state country ); -if ( $conf->exists('tax-ship_address') ) { - - $where .= " - AND ( ( ( ship_last IS NULL OR ship_last = '' ) - AND ( county = ? OR ? = '' ) - AND ( state = ? OR ? = '' ) - AND country = ? - ) - OR ( ship_last IS NOT NULL AND ship_last != '' - AND ( ship_county = ? OR ? = '' ) - AND ( ship_state = ? OR ? = '' ) - AND ship_country = ? - ) - ) - "; - # AND payby != 'COMP' - - push @base_param, @base_param; +my $join_cust = ' JOIN cust_bill USING ( invnum ) + LEFT JOIN cust_main USING ( custnum ) '; +my $join_cust_pkg = $join_cust. + ' LEFT JOIN cust_pkg USING ( pkgnum ) + LEFT JOIN part_pkg USING ( pkgpart ) '; +$join_cust_pkg .= ' LEFT JOIN cust_location USING ( locationnum )' + if $conf->exists('tax-pkg_address'); -} else { +my $from_join_cust_pkg = " FROM cust_bill_pkg $join_cust_pkg "; - $where .= " - AND ( county = ? OR ? = '' ) - AND ( state = ? OR ? = '' ) - AND country = ? - "; - # AND payby != 'COMP' +my $where = "WHERE _date >= $beginning AND _date <= $ending "; -} +my( $location_sql, @base_param ) = FS::cust_pkg->location_sql; +$where .= " AND $location_sql "; my $agentname = ''; if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { @@ -229,76 +220,82 @@ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { $where .= ' AND cust_main.agentnum = '. $agent->agentnum; } -my $gotcust = " - WHERE 0 < ( SELECT COUNT(*) FROM cust_main -"; -if ( $conf->exists('tax-ship_address') ) { - - $gotcust .= " - WHERE +sub gotcust { + my $table = shift; + my $prefix = @_ ? shift : ''; + " + ( $table.${prefix}county = cust_main_county.county + OR cust_main_county.county = '' + OR cust_main_county.county IS NULL ) + AND ( $table.${prefix}state = cust_main_county.state + OR cust_main_county.state = '' + OR cust_main_county.state IS NULL ) + AND ( $table.${prefix}country = cust_main_county.country ) + "; +} - ( cust_main_county.country = cust_main.country - OR cust_main_county.country = cust_main.ship_country - ) +my $gotcust; +if ( $conf->exists('tax-ship_address') ) { - AND + $gotcust = " + ( cust_main_county.country = cust_main.country + OR cust_main_county.country = cust_main.ship_country + ) - ( + AND - ( ( ship_last IS NULL OR ship_last = '' ) - AND ( cust_main_county.country = cust_main.country ) - AND ( cust_main_county.state = cust_main.state - OR cust_main_county.state = '' - OR cust_main_county.state IS NULL ) - AND ( cust_main_county.county = cust_main.county - OR cust_main_county.county = '' - OR cust_main_county.county IS NULL ) - ) - - OR - - ( ship_last IS NOT NULL AND ship_last != '' - AND ( cust_main_county.country = cust_main.ship_country ) - AND ( cust_main_county.state = cust_main.ship_state - OR cust_main_county.state = '' - OR cust_main_county.state IS NULL ) - AND ( cust_main_county.county = cust_main.ship_county - OR cust_main_county.county = '' - OR cust_main_county.county IS NULL ) - ) - - ) - - LIMIT 1 - ) + ( + ( ( ship_last IS NULL OR ship_last = '' ) + AND ". gotcust('cust_main'). " + ) + OR + ( ship_last IS NOT NULL AND ship_last != '' + AND ". gotcust('cust_main', 'ship_'). " + ) + ) "; } else { - $gotcust .= " - WHERE ( cust_main.county = cust_main_county.county - OR cust_main_county.county = '' - OR cust_main_county.county IS NULL ) - AND ( cust_main.state = cust_main_county.state - OR cust_main_county.state = '' - OR cust_main_county.state IS NULL ) - AND ( cust_main.country = cust_main_county.country ) - LIMIT 1 - ) - "; + $gotcust = gotcust('cust_main'); } +if ( $conf->exists('tax-pkg_address') ) { + $gotcust = " + ( cust_pkg.locationnum IS NULL AND $gotcust) + OR ( cust_pkg.locationnum IS NOT NULL AND ". gotcust('cust_location'). " )"; + $gotcust = + "WHERE 0 < ( SELECT COUNT(*) FROM cust_pkg + LEFT JOIN cust_main USING ( custnum ) + LEFT JOIN cust_location USING ( locationnum ) + WHERE $gotcust + LIMIT 1 + ) + "; +} else { + $gotcust = + "WHERE 0 < ( SELECT COUNT(*) FROM cust_main WHERE $gotcust LIMIT 1 )"; +} -my($total, $tot_taxable, $owed, $tax) = ( 0, 0, 0, 0, 0 ); -my( $exempt_cust, $exempt_pkg, $exempt_monthly ) = ( 0, 0 ); my $out = 'Out of taxable region(s)'; my %regions = (); -foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) { + +foreach my $r ( qsearch({ 'table' => 'cust_main_county', + 'extra_sql' => $gotcust, + }) + ) +{ #warn $r->county. ' '. $r->state. ' '. $r->country. "\n"; my $label = getlabel($r); $regions{$label}->{'label'} = $label; - $regions{$label}->{'url_param'} = join(';', map "$_=".$r->$_(), qw( county state country ) ); + + $regions{$label}->{$_} = $r->$_() for (qw( county state country )); #taxname? + + $regions{$label}->{'url_param'} = + join(';', map "$_=".uri_escape($r->$_()), + qw( county state country taxname ) + ); my @param = @base_param; my $mywhere = $where; @@ -307,33 +304,22 @@ foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) { $mywhere .= " AND taxclass = ? "; push @param, 'taxclass'; - $regions{$label}->{'url_param'} .= ';taxclass='. $r->taxclass - if $cgi->param('show_taxclasses'); - - } else { + $regions{$label}->{'url_param'} .= ';taxclass='. uri_escape($r->taxclass); + #no, always# if $cgi->param('show_taxclasses'); - my $same_query = "SELECT COUNT(*) FROM cust_main_county WHERE country = ?"; - my @same_param = ( 'country' ); - foreach my $opt_field (qw( state county )) { - if ( $r->$opt_field() ) { - $same_query .= " AND $opt_field = ?"; - push @same_param, $opt_field; - } else { - $same_query .= " AND $opt_field IS NULL"; - } - } + $regions{$label}->{'taxclass'} = $r->taxclass; - my $num_same_region = scalar_sql( $r, \@same_param, $same_query ); + } else { - if ( $num_same_region > 1 ) { + $regions{$label}->{'url_param'} .= ';taxclassNULL=1' + if $cgi->param('show_taxclasses'); - $mywhere .= " AND taxclass IS NULL"; + my $same_sql = $r->sql_taxclass_sameregion; + $mywhere .= " AND $same_sql" if $same_sql; - } - } - my $fromwhere = $from_join_cust. $join_pkg. $mywhere. " AND payby != 'COMP' "; + my $fromwhere = "$from_join_cust_pkg $mywhere"; # AND payby != 'COMP' "; # my $label = getlabel($r); # $regions{$label}->{'label'} = $label; @@ -342,12 +328,17 @@ foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) { ## calculate total for this region - my $t = scalar_sql($r, \@param, - "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $fromwhere AND $nottax" - ); - $total += $t; + my $t_sql = + "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $fromwhere AND $nottax"; + my $t = scalar_sql($r, \@param, $t_sql); $regions{$label}->{'total'} += $t; + #if ( $label eq $out ) # && $t ) { + # warn "adding $t for ". + # join('/', map $r->$_, qw( taxclass county state country ) ). "\n"; + # #warn $t_sql if $r->state eq 'FL'; + #} + ## calculate customer-exemption for this region ## my $taxable = $t; @@ -364,12 +355,27 @@ foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) { # ); # } + #false laziness -ish w/report_tax.cgi + my $cust_exempt; + if ( $r->taxname ) { + my $q_taxname = dbh->quote($r->taxname); + $cust_exempt = + "( tax = 'Y' + OR EXISTS ( SELECT 1 FROM cust_main_exemption + WHERE cust_main_exemption.custnum = cust_main.custnum + AND cust_main_exemption.taxname = $q_taxname + ) + ) + "; + } else { + $cust_exempt = " tax = 'Y' "; + } + my $x_cust = scalar_sql($r, \@param, "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) - $fromwhere AND $nottax AND tax = 'Y' " + $fromwhere AND $nottax AND $cust_exempt " ); - $exempt_cust += $x_cust; $regions{$label}->{'exempt_cust'} += $x_cust; ## calculate package-exemption for this region @@ -397,7 +403,6 @@ foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) { AND ( tax != 'Y' OR tax IS NULL ) " ); - $exempt_pkg += $x_pkg; $regions{$label}->{'exempt_pkg'} += $x_pkg; ## calculate monthly exemption (texas tax) for this region @@ -409,23 +414,14 @@ foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) { "SELECT SUM(amount) FROM cust_tax_exempt_pkg JOIN cust_bill_pkg USING ( billpkgnum ) - $join_cust $join_pkg + $join_cust_pkg $mywhere" ); -# if ( $x_monthly ) { -# #warn $r->taxnum(). ": $x_monthly\n"; -# $taxable -= $x_monthly; -# } - - $exempt_monthly += $x_monthly; $regions{$label}->{'exempt_monthly'} += $x_monthly; my $taxable = $t - $x_cust - $x_pkg - $x_monthly; - - $tot_taxable += $taxable; $regions{$label}->{'taxable'} += $taxable; - $owed += $taxable * ($r->tax/100); $regions{$label}->{'owed'} += $taxable * ($r->tax/100); if ( defined($regions{$label}->{'rate'}) @@ -437,37 +433,43 @@ foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) { } -my $taxwhere = "$from_join_cust $where AND payby != 'COMP' "; -my @taxparam = @base_param; -my %base_regions = (); -#foreach my $label ( keys %regions ) { -foreach my $r ( - qsearch( 'cust_main_county', - {}, - "DISTINCT - country, - state, - county, - CASE WHEN taxname IS NULL THEN '' ELSE taxname END AS taxname,". - - #a little bit unsure of this part... test? - #ah, it looks like it winds up being irrelevant as ->{'tax'} - # from $regions is not displayed when show_taxclasses is on - ( $cgi->param('show_taxclasses') - ? " CASE WHEN taxclass IS NULL THEN '' ELSE taxclass END " - : " '' " - )." AS taxclass" - , - $gotcust - ) -) { +my $distinct = "country, state, county, + CASE WHEN taxname IS NULL THEN '' ELSE taxname END AS taxname"; +my $taxclass_distinct = + #a little bit unsure of this part... test? + #ah, it looks like it winds up being irrelevant as ->{'tax'} + # from $regions is not displayed when show_taxclasses is on + ( $cgi->param('show_taxclasses') + ? " CASE WHEN taxclass IS NULL THEN '' ELSE taxclass END " + : " '' " + )." AS taxclass"; - #warn join('-', map { $r->$_() } qw( country state county taxname ) )."\n"; - my $label = getlabel($r); +my %qsearch = ( + 'select' => "DISTINCT $distinct, $taxclass_distinct", + 'table' => 'cust_main_county', + 'hashref' => {}, + 'extra_sql' => $gotcust, +); - #my $fromwhere = $join_pkg. $where. " AND payby != 'COMP' "; - #my @param = @base_param; +my $taxfromwhere = " FROM cust_bill_pkg $join_cust "; +my $taxwhere = $where; +if ( $conf->exists('tax-pkg_address') ) { + + $taxfromwhere .= 'LEFT JOIN cust_bill_pkg_tax_location USING ( billpkgnum ) + LEFT JOIN cust_location USING ( locationnum ) '; + + #quelle kludge + $taxwhere =~ s/cust_pkg\.locationnum/cust_bill_pkg_tax_location.locationnum/g; + +} +$taxfromwhere .= " $taxwhere "; #AND payby != 'COMP' "; +my @taxparam = @base_param; + +#should i be a cust_main_county method or something +#need to pass in $taxfromwhere & @taxparam??? +my $_taxamount_sub = sub { + my $r = shift; #match itemdesc if necessary! my $named_tax = @@ -476,48 +478,157 @@ foreach my $r ( : "AND ( itemdesc IS NULL OR itemdesc = '' OR itemdesc = 'Tax' )"; my $sql = "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) ". - " $taxwhere AND pkgnum = 0 $named_tax"; + " $taxfromwhere AND cust_bill_pkg.pkgnum = 0 $named_tax"; + + scalar_sql($r, \@taxparam, $sql ); +}; + +#tax-report_groups filtering +my($group_op, $group_value) = ( '', '' ); +if ( $cgi->param('report_group') =~ /^(=|!=) (.*)$/ ) { + ( $group_op, $group_value ) = ( $1, $2 ); +} +my $group_test = sub { + my $label = shift; + return 1 unless $group_op; #in case we get called inadvertantly + if ( $label eq $out ) { #don't display "out of taxable region" in this case + 0; + } elsif ( $group_op eq '=' ) { + $label =~ /^$group_value/; + } elsif ( $group_op eq '!=' ) { + $label !~ /^$group_value/; + } else { + die "guru meditation #00de: group_op $group_op\n"; + } +}; + +my $tot_tax = 0; +#foreach my $label ( keys %regions ) { +foreach my $r ( qsearch(\%qsearch) ) { + + #warn join('-', map { $r->$_() } qw( country state county taxname ) )."\n"; + + my $label = getlabel($r); + if ( $group_op ) { + next unless &{$group_test}($label); + } + + #my $fromwhere = $join_pkg. $where. " AND payby != 'COMP' "; + #my @param = @base_param; + + my $x = &{$_taxamount_sub}($r); - my $x = scalar_sql($r, \@taxparam, $sql ); - $tax += $x; $regions{$label}->{'tax'} += $x; + $tot_tax += $x unless $cgi->param('show_taxclasses'); + +} + +my %base_regions = (); +if ( $cgi->param('show_taxclasses') ) { + + $qsearch{'select'} = "DISTINCT $distinct"; + foreach my $r ( qsearch(\%qsearch) ) { + + my $x = &{$_taxamount_sub}($r); - 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 "$_=". uri_escape($r->$_()), + qw( county state country taxname ) + ); + $base_regions{$base_label}->{'tax'} += $x; + $tot_tax += $x; } } +my @regions = keys %regions; + +#tax-report_groups filtering +@regions = grep &{$group_test}($_), @regions + if $group_op; + +#calculate totals +my( $total, $tot_taxable, $tot_owed ) = ( 0, 0, 0 ); +my( $exempt_cust, $exempt_pkg, $exempt_monthly ) = ( 0, 0, 0 ); +my %taxclasses = (); +my %county = (); +my %state = (); +my %country = (); +foreach (@regions) { + $total += $regions{$_}->{'total'}; + $tot_taxable += $regions{$_}->{'taxable'}; + $tot_owed += $regions{$_}->{'owed'}; + $exempt_cust += $regions{$_}->{'exempt_cust'}; + $exempt_pkg += $regions{$_}->{'exempt_pkg'}; + $exempt_monthly += $regions{$_}->{'exempt_monthly'}; + $taxclasses{$regions{$_}->{'taxclass'}} = 1 + if $regions{$_}->{'taxclass'}; + $county{$regions{$_}->{'county'}} = 1; + $state{$regions{$_}->{'state'}} = 1; + $country{$regions{$_}->{'country'}} = 1; +} + +my $total_url_param = ''; +my $total_url_param_invoiced = ''; +if ( $group_op ) { + + my @country = keys %country; + warn "WARNING: multiple countries on this grouped report; total links broken" + if scalar(@country) > 1; + my $country = $country[0]; + + my @state = keys %state; + warn "WARNING: multiple countries on this grouped report; total links broken" + if scalar(@state) > 1; + my $state = $state[0]; + + $total_url_param_invoiced = + $total_url_param = + 'report_group='.uri_escape("$group_op $group_value").';'. + join(';', map 'taxclass='.uri_escape($_), keys %taxclasses ); + $total_url_param .= ';'. + "country=$country;state=".uri_escape($state).';'. + join(';', map 'county='.uri_escape($_), keys %county ) ; + +} + #ordering -my @regions = +@regions = map $regions{$_}, sort { ( ($a eq $out) cmp ($b eq $out) ) || ($b cmp $a) } - keys %regions; + @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' => '', + 'url_param' => $total_url_param, + 'url_param_inv' => $total_url_param_invoiced, 'total' => $total, 'exempt_cust' => $exempt_cust, 'exempt_pkg' => $exempt_pkg, 'exempt_monthly' => $exempt_monthly, 'taxable' => $tot_taxable, 'rate' => '', - 'owed' => $owed, - 'tax' => $tax, + 'owed' => $tot_owed, + 'tax' => $tot_tax, }; #-- +my $money_char = $conf->config('money_char') || '$'; +my $money_sprintf = sub { + $money_char. sprintf('%.2f', shift ); +}; + sub getlabel { my $r = shift; my %opt = @_; @@ -537,10 +648,10 @@ sub getlabel { #kludge to avoid "will not stay shared" warning my $out = 'Out of taxable region(s)'; $label = $out; - } elsif ( $r->taxname ) { - $label = $r->taxname; -# $regions{$label}->{'taxname'} = $label; -# push @{$regions{$label}->{$_}}, $r->$_() foreach qw( county state country ); +# } elsif ( $r->taxname && count_taxname($r->taxname) == 1 ) { +# $label = $r->taxname; +## $regions{$label}->{'taxname'} = $label; +## push @{$regions{$label}->{$_}}, $r->$_() foreach qw( county state country ); } else { $label = $r->country; $label = $r->state.", $label" if $r->state; @@ -549,11 +660,22 @@ sub getlabel { if $r->taxclass && $cgi->param('show_taxclasses') && ! $opt{'no_taxclass'}; - #$label = $r->taxname. " ($label)" if $r->taxname; + $label = $r->taxname. " ($label)" if $r->taxname; } return $label; } +#my %count_taxname = (); #cache +#sub count_taxname { +# my $taxname = shift; +# return $count_taxname{$taxname} if exists $count_taxname{$taxname}; +# my $sql = 'SELECT COUNT(*) FROM cust_main_county WHERE taxname = ?'; +# my $sth = dbh->prepare($sql) or die dbh->errstr; +# $sth->execute( $taxname ) +# or die "Unexpected error executing statement $sql: ". $sth->errstr; +# $count_taxname{$taxname} = $sth->fetchrow_arrayref->[0]; +#} + #false laziness w/FS::Report::Table::Monthly (sub should probably be moved up #to FS::Report or FS::Record or who the fuck knows where) sub scalar_sql { @@ -565,8 +687,6 @@ sub scalar_sql { $sth->fetchrow_arrayref->[0] || 0; } - - my $dateagentlink = "begin=$beginning;end=$ending"; $dateagentlink .= ';agentnum='. $cgi->param('agentnum') if length($agentname);