X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=7eb07cf3ce08f47764f36f30bf02d144c856d1cd;hb=6c4d9632f4d5cd1164ab9183932fbdf9137945aa;hp=7585caa1545ad2c1732e524001d6282305ffab9b;hpb=de602da29b21203c4526a391c50d27cbf2e92fec;p=freeside.git diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi index 7585caa15..7eb07cf3c 100755 --- a/httemplate/search/report_tax.cgi +++ b/httemplate/search/report_tax.cgi @@ -21,11 +21,10 @@ Tax owed % unless ( $cgi->param('show_taxclasses') ) { - Tax invoiced % } - + Total @@ -37,188 +36,163 @@ 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'} ne 'Total' ) { +% if ( $region->{'label'} eq $out ) { +% $link = ';out=1'; +% } else { +% $link = ';'. $region->{'url_param'}; +% } +% } % +% if ( $bgcolor eq $bgcolor1 ) { +% $bgcolor = $bgcolor2; +% } else { +% $bgcolor = $bgcolor1; +% } % -% - +% my $td = qq(TD CLASS="grid" BGCOLOR="$bgcolor"); +% 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" %> + <<%$td%> ALIGN="right"> + <% &$money_sprintf( $region->{'owed'} ) %> -% unless ( $cgi->param('show_taxclasses') ) { - - <% $money_char %><% sprintf('%.2f', $region->{'tax'} ) %> +% unless ( $cgi->param('show_taxclasses') ) { + <<%$td%> ALIGN="right"> + <% &$money_sprintf( $region->{'tax'} ) %> % } % } - -% if ( $cgi->param('show_taxclasses') ) { +% 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 ) { +
+ <% include('/elements/table-grid.html') %> + + + Tax invoiced + + +% #some false laziness w/above +% $bgcolor1 = '#eeeeee'; +% $bgcolor2 = '#ffffff'; % -% if ( $bgcolor eq $bgcolor1 ) { -% $bgcolor = $bgcolor2; +% foreach my $region ( @base_regions ) { +% +% my $link = ''; +% #if ( $region->{'label'} ne 'Total' ) { +% if ( $region->{'label'} eq $out ) { +% $link = ';out=1'; % } else { -% $bgcolor = $bgcolor1; +% $link = ';'. $region->{'url_param'}; % } -% -% my $link = ''; -% #if ( $region->{'label'} ne 'Total' ) { -% if ( $region->{'label'} eq $out ) { -% $link = ';out=1'; -% } else { -% $link = ';'. $region->{'url_param'}; -% } -% #} -% - - - - <% $region->{'label'} %> - - <% $money_char %><% sprintf('%.2f', $region->{'tax'} ) %> - - -% } +% #} % % 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( $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 $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'); -my $where = "WHERE _date >= $beginning AND _date <= $ending "; -my @base_param = qw( county county state state country ); -if ( $conf->exists('tax-ship_address') ) { +my $from_join_cust_pkg = " FROM cust_bill_pkg $join_cust_pkg "; - $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 $where = "WHERE _date >= $beginning AND _date <= $ending "; -} else { - - $where .= " - AND ( county = ? OR ? = '' ) - AND ( state = ? OR ? = '' ) - AND country = ? - "; - # AND payby != 'COMP' - -} +my( $location_sql, @base_param ) = FS::cust_pkg->location_sql; +$where .= " AND $location_sql "; my $agentname = ''; if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { @@ -228,70 +202,68 @@ 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 ); my( $exempt_cust, $exempt_pkg, $exempt_monthly ) = ( 0, 0, 0 ); my $out = 'Out of taxable region(s)'; my %regions = (); + foreach my $r ( qsearch({ 'table' => 'cust_main_county', 'extra_sql' => $gotcust, }) @@ -301,7 +273,10 @@ foreach my $r ( qsearch({ 'table' => 'cust_main_county', my $label = getlabel($r); $regions{$label}->{'label'} = $label; - $regions{$label}->{'url_param'} = join(';', map "$_=".$r->$_(), qw( county state country ) ); + $regions{$label}->{'url_param'} = + join(';', map "$_=".uri_escape($r->$_()), + qw( county state country taxname ) + ); my @param = @base_param; my $mywhere = $where; @@ -310,7 +285,7 @@ foreach my $r ( qsearch({ 'table' => 'cust_main_county', $mywhere .= " AND taxclass = ? "; push @param, 'taxclass'; - $regions{$label}->{'url_param'} .= ';taxclass='. $r->taxclass + $regions{$label}->{'url_param'} .= ';taxclass='. uri_escape($r->taxclass) if $cgi->param('show_taxclasses'); } else { @@ -323,7 +298,7 @@ foreach my $r ( qsearch({ 'table' => 'cust_main_county', } - 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; @@ -399,7 +374,7 @@ foreach my $r ( qsearch({ 'table' => 'cust_main_county', "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 ) { @@ -438,6 +413,7 @@ my $taxclass_distinct = : " '' " )." AS taxclass"; + my %qsearch = ( 'select' => "DISTINCT $distinct, $taxclass_distinct", 'table' => 'cust_main_county', @@ -445,11 +421,22 @@ my %qsearch = ( 'extra_sql' => $gotcust, ); -my $taxwhere = "$from_join_cust $where AND payby != 'COMP' "; +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 $taxwhere & @taxparam??? +#need to pass in $taxfromwhere & @taxparam??? my $_taxamount_sub = sub { my $r = shift; @@ -460,7 +447,7 @@ my $_taxamount_sub = sub { : "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 ); }; @@ -492,8 +479,12 @@ 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; $tax += $x; } @@ -527,6 +518,11 @@ push @regions, { #-- +my $money_char = $conf->config('money_char') || '$'; +my $money_sprintf = sub { + $money_char. sprintf('%.2f', shift ); +}; + sub getlabel { my $r = shift; my %opt = @_;