X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=0f33c46760de69052deb0e7582f2beea7735cb59;hp=b73910a48060bcdab89b6776ab57d360dab95568;hb=c1bb4ddb71147d0571bd301a6d8c452fdf0e1bc9;hpb=113de1f1167d9bc194e467b14a9d2f7f673d687f
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index b73910a48..0f33c4676 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -1,25 +1,31 @@
<%
+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 $from_join_cust = "
- FROM cust_bill_pkg
+my $join_cust = "
JOIN cust_bill USING ( invnum )
- JOIN cust_main USING ( custnum )
+ LEFT JOIN cust_main USING ( custnum )
";
+my $from_join_cust = "
+ FROM cust_bill_pkg
+ $join_cust
+";
my $join_pkg = "
- JOIN cust_pkg USING ( pkgnum )
- JOIN part_pkg USING ( pkgpart )
+ LEFT JOIN cust_pkg USING ( pkgnum )
+ LEFT JOIN part_pkg USING ( pkgpart )
";
my $where = "
WHERE _date >= $beginning AND _date <= $ending
AND ( county = ? OR ? = '' )
AND ( state = ? OR ? = '' )
AND country = ?
- AND payby != 'COMP'
";
+# AND payby != 'COMP'
my @base_param = qw( county county state state country );
my $agentname = '';
@@ -43,7 +49,6 @@ my $gotcust = "
)
";
-my $monthly_exempt_warning = 0;
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)';
@@ -53,18 +58,20 @@ foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) {
my $label = getlabel($r);
$regions{$label}->{'label'} = $label;
-
$regions{$label}->{'url_param'} = join(';', map "$_=".$r->$_(), qw( county state country ) );
- my $fromwhere = $from_join_cust. $join_pkg. $where;
my @param = @base_param;
+ my $mywhere = $where;
if ( $r->taxclass ) {
- $fromwhere .= " AND taxclass = ? ";
+ $mywhere .= " AND taxclass = ? ";
push @param, 'taxclass';
- $regions{$label}->{'url_param'} .= ';taxclass='. $r->taxclass;
+ $regions{$label}->{'url_param'} .= ';taxclass='. $r->taxclass
+ if $cgi->param('show_taxclasses');
}
+ my $fromwhere = $from_join_cust. $join_pkg. $mywhere. " AND payby != 'COMP' ";
+
# my $label = getlabel($r);
# $regions{$label}->{'label'} = $label;
@@ -78,57 +85,80 @@ foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) {
$total += $t;
$regions{$label}->{'total'} += $t;
- ## calculate package-exemption for this region
-
- foreach my $e ( grep { $r->get($_.'tax') =~ /^Y/i }
- qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
- my $x = scalar_sql($r, \@param,
- "SELECT SUM($e) $fromwhere AND $nottax"
- );
- $exempt_pkg += $x;
- $regions{$label}->{'exempt_pkg'} += $x;
- }
-
## calculate customer-exemption for this region
- my($taxable, $x_cust) = (0, 0);
- foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i }
- qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
- $taxable += scalar_sql($r, \@param,
- "SELECT SUM($e) $fromwhere AND $nottax AND ( tax != 'Y' OR tax IS NULL )"
- );
-
- $x_cust += scalar_sql($r, \@param,
- "SELECT SUM($e) $fromwhere AND $nottax AND tax = 'Y'"
- );
- }
+## my $taxable = $t;
+
+# my($taxable, $x_cust) = (0, 0);
+# foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i }
+# qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
+# $taxable += scalar_sql($r, \@param,
+# "SELECT SUM($e) $fromwhere AND $nottax AND ( tax != 'Y' OR tax IS NULL )"
+# );
+#
+# $x_cust += scalar_sql($r, \@param,
+# "SELECT SUM($e) $fromwhere AND $nottax AND 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' "
+ );
$exempt_cust += $x_cust;
$regions{$label}->{'exempt_cust'} += $x_cust;
+
+ ## calculate package-exemption for this region
- ## calculate monthly exemption (texas tax) for this region
+ my $x_pkg = scalar_sql($r, \@param,
+ "SELECT SUM(
+ ( CASE WHEN part_pkg.setuptax = 'Y'
+ THEN cust_bill_pkg.setup
+ ELSE 0
+ END
+ )
+ +
+ ( CASE WHEN part_pkg.recurtax = 'Y'
+ THEN cust_bill_pkg.recur
+ ELSE 0
+ END
+ )
+ )
+ $fromwhere
+ AND $nottax
+ AND (
+ ( part_pkg.setuptax = 'Y' AND cust_bill_pkg.setup > 0 )
+ OR ( part_pkg.recurtax = 'Y' AND cust_bill_pkg.recur > 0 )
+ )
+ AND ( tax != 'Y' OR tax IS NULL )
+ "
+ );
+ $exempt_pkg += $x_pkg;
+ $regions{$label}->{'exempt_pkg'} += $x_pkg;
- my($sday,$smon,$syear) = (localtime($beginning) )[ 3, 4, 5 ];
- $monthly_exempt_warning=1 if $sday != 1 && $beginning;
- $smon++; $syear+=1900;
+ ## calculate monthly exemption (texas tax) for this region
- my $eending = ( $ending == 4294967295 ) ? time : $ending;
- my($eday,$emon,$eyear) = (localtime($eending) )[ 3, 4, 5 ];
- $emon++; $eyear+=1900;
+ # count up all the cust_tax_exempt_pkg records associated with
+ # the actual line items.
- my $x_monthly = scalar_sql($r, [ 'taxnum' ],
- "SELECT SUM(amount) FROM cust_tax_exempt where taxnum = ? ".
- " AND ( year > $syear OR ( year = $syear and month >= $smon ) )".
- " AND ( year < $eyear OR ( year = $eyear and month <= $emon ) )"
+ my $x_monthly = scalar_sql($r, \@param,
+ "SELECT SUM(amount)
+ FROM cust_tax_exempt_pkg
+ JOIN cust_bill_pkg USING ( billpkgnum )
+ $join_cust $join_pkg
+ $mywhere"
);
- if ( $x_monthly ) {
- warn $r->taxnum(). ": $x_monthly\n";
- $taxable -= $x_monthly;
- }
+# 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;
@@ -144,9 +174,9 @@ foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) {
}
-my $taxwhere = "$from_join_cust $where";
+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',
@@ -160,7 +190,7 @@ foreach my $r (
my $label = getlabel($r);
- my $fromwhere = $join_pkg. $where;
+ my $fromwhere = $join_pkg. $where. " AND payby != 'COMP' ";
my @param = @base_param;
#match itemdesc if necessary!
@@ -175,12 +205,26 @@ foreach my $r (
$tax += $x;
$regions{$label}->{'tax'} += $x;
+ 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 ) );
+ $base_regions{$base_label}->{'tax'} += $x;
+ }
+
}
#ordering
-my @regions = map $regions{$_},
- sort { ( ($a eq $out) cmp ($b eq $out) ) || ($b cmp $a) }
- keys %regions;
+my @regions =
+ map $regions{$_},
+ sort { ( ($a eq $out) cmp ($b eq $out) ) || ($b cmp $a) }
+ keys %regions;
+
+my @base_regions =
+ map $base_regions{$_},
+ sort { ( ($a eq $out) cmp ($b eq $out) ) || ($b cmp $a) }
+ keys %base_regions;
push @regions, {
'label' => 'Total',
@@ -199,6 +243,7 @@ push @regions, {
sub getlabel {
my $r = shift;
+ my %opt = @_;
my $label;
if (
@@ -223,7 +268,10 @@ sub getlabel {
$label = $r->country;
$label = $r->state.", $label" if $r->state;
$label = $r->county." county, $label" if $r->county;
- $label = "$label (". $r->taxclass. ")" if $r->taxclass;
+ $label = "$label (". $r->taxclass. ")"
+ if $r->taxclass
+ && $cgi->param('show_taxclasses')
+ && ! $opt{'no_taxclass'};
#$label = $r->taxname. " ($label)" if $r->taxname;
}
return $label;
@@ -243,15 +291,20 @@ sub scalar_sql {
%>
<%
-
-my $baselink = $p. "search/cust_bill_pkg.cgi?begin=$beginning;end=$ending";
-
+my $dateagentlink = "begin=$beginning;end=$ending";
+$dateagentlink .= ';agentnum='. $cgi->param('agentnum')
+ if length($agentname);
+my $baselink = $p. "search/cust_bill_pkg.cgi?$dateagentlink";
+my $exemptlink = $p. "search/cust_tax_exempt_pkg.cgi?$dateagentlink";
%>
-
-<%= header( "$agentname Sales Tax Report - ".
- time2str('%h %o %Y through ', $beginning ).
- ( $cgi->param('ending') == 4294967295
+<%= include("/elements/header.html", "$agentname Sales Tax Report - ".
+ ( $beginning
+ ? time2str('%h %o %Y ', $beginning )
+ : ''
+ ).
+ 'through '.
+ ( $ending == 4294967295
? 'now'
: time2str('%h %o %Y', $ending )
),
@@ -262,17 +315,25 @@ my $baselink = $p. "search/cust_bill_pkg.cgi?begin=$beginning;end=$ending";
<%= include('/elements/table-grid.html') %>
- |
- Sales |
- Rate |
- Tax owed |
- Tax invoiced |
+ |
+ Sales |
+ |
+ Rate |
+ |
+ Tax owed |
+ <% unless ( $cgi->param('show_taxclasses') ) { %>
+ Tax invoiced |
+ <% } %>
| Total |
+ |
Non-taxable
(tax-exempt customer) |
+ |
Non-taxable
(tax-exempt package) |
+ |
Non-taxable
(monthly exemption) |
+ |
Taxable |
@@ -289,50 +350,115 @@ my $baselink = $p. "search/cust_bill_pkg.cgi?begin=$beginning;end=$ending";
$bgcolor = $bgcolor1;
}
- my $link = $baselink;
+ my $link = '';
if ( $region->{'label'} ne 'Total' ) {
if ( $region->{'label'} eq $out ) {
- $link .= ';out=1';
+ $link = ';out=1';
} else {
- $link .= ';'. $region->{'url_param'};
+ $link = ';'. $region->{'url_param'};
}
}
+
+
+
+
%>
+
| <%= $region->{'label'} %> |
- $<%= sprintf('%.2f', $region->{'total'} ) %>
+ <%= $money_char %><%= sprintf('%.2f', $region->{'total'} ) %>
|
+ - |
- $<%= sprintf('%.2f', $region->{'exempt_cust'} ) %>
+ <%= $money_char %><%= sprintf('%.2f', $region->{'exempt_cust'} ) %>
|
+ - |
- $<%= sprintf('%.2f', $region->{'exempt_pkg'} ) %>
+ <%= $money_char %><%= sprintf('%.2f', $region->{'exempt_pkg'} ) %>
|
+ - |
- $<%= sprintf('%.2f', $region->{'exempt_monthly'} ) %>
+ <%= $money_char %><%= sprintf('%.2f', $region->{'exempt_monthly'} ) %>
|
+ = |
- $<%= sprintf('%.2f', $region->{'taxable'} ) %>
+ <%= $money_char %><%= sprintf('%.2f', $region->{'taxable'} ) %>
|
+ <%= $region->{'label'} eq 'Total' ? '' : ' X ' %> |
<%= $region->{'rate'} %> |
+ <%= $region->{'label'} eq 'Total' ? '' : ' = ' %> |
- $<%= sprintf('%.2f', $region->{'owed'} ) %>
- |
-
- $<%= sprintf('%.2f', $region->{'tax'} ) %>
+ <%= $money_char %><%= sprintf('%.2f', $region->{'owed'} ) %>
|
+ <% unless ( $cgi->param('show_taxclasses') ) { %>
+
+ <%= $money_char %><%= sprintf('%.2f', $region->{'tax'} ) %>
+ |
+ <% } %>
+
<% } %>
-<% if ( $monthly_exempt_warning ) { %>
+
+<% if ( $cgi->param('show_taxclasses') ) { %>
+
- Partial-month tax reports (except for current month) may not be correct due
- to month-granularity tax exemption (usually "texas tax"). For an accurate
- report, start on the first of a month and end on the last day of a month (or
- leave blank for to now).
+ <%= 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'};
+ }
+ #}
+ %>
+
+
+ | <%= $region->{'label'} %> |
+
+ <%= $money_char %><%= sprintf('%.2f', $region->{'tax'} ) %>
+ |
+
+
+ <% } %>
+
+ <%
+ if ( $bgcolor eq $bgcolor1 ) {
+ $bgcolor = $bgcolor2;
+ } else {
+ $bgcolor = $bgcolor1;
+ }
+ %>
+
+
+ | Total |
+
+ <%= $money_char %><%= sprintf('%.2f', $tax ) %>
+ |
+
+
+
+
<% } %>