$cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
my $pbeginning = $1;
-my $beginning = str2time($1) || 0;
+my $beginning = $1 ? str2time($1) : 0;
$cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
my $pending = $1;
-my $ending = ( str2time($1) || 4294880896 ) + 86399;
-
-my($total, $exempt, $taxable, $tax) = ( 0, 0, 0, 0 );
+my $ending = ( $1 ? str2time($1) : 4294880896 ) + 86399;
+
+my $from_join_cust = "
+ FROM cust_bill_pkg
+ JOIN cust_bill USING ( invnum )
+ JOIN cust_main USING ( custnum )
+";
+my $join_pkg = "
+ JOIN cust_pkg USING ( pkgnum )
+ JOIN part_pkg USING ( pkgpart )
+";
+my $where = "
+ WHERE _date >= $beginning AND _date <= $ending
+ AND ( county = ? OR ? = '' )
+ AND ( state = ? OR ? = '' )
+ AND ( country = ? )
+ AND payby != 'COMP'
+";
+my @base_param = qw( county county state state country );
+
+my $gotcust = "
+ WHERE 0 < ( SELECT COUNT(*) FROM cust_main
+ 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
+ )
+";
+
+my($total, $exempt, $taxable, $owed, $tax) = ( 0, 0, 0, 0, 0 );
my $out = 'Out of taxable region(s)';
my %regions;
-foreach my $r ( qsearch('cust_main_county', {}) ) {
- my $label;
- if ( $r->tax == 0 ) {
- $label = $out;
- } elsif ( $r->taxname ) {
- $label = $r->taxname;
- } else {
- $label = $r->country;
- $label = $r->state.", $label" if $r->state;
- $label = $r->county." county, $label" if $r->county;
- }
+foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) {
+ #warn $r->county. ' '. $r->state. ' '. $r->country. "\n";
- #match taxclass too?
+ my $label = getlabel($r);
+ $regions{$label}->{'label'} = $label;
+
+ my $fromwhere = $from_join_cust. $join_pkg. $where;
+ my @param = @base_param;
+
+ if ( $r->taxclass ) {
+ $fromwhere .= " AND ( taxclass = ? ) ";
+ push @param, 'taxclass';
+ }
- my $fromwhere = "
- FROM cust_bill_pkg
- JOIN cust_bill USING ( invnum )
- JOIN cust_main USING ( custnum )
- WHERE _date >= $beginning AND _date <= $ending
- AND county = ? AND state = ? AND country = ?
- ";
my $nottax = 'pkgnum != 0';
- my $a = scalar_sql($r,
- "SELECT SUM(setup+recur) $fromwhere AND $nottax"
+ my $a = scalar_sql($r, \@param,
+ "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $fromwhere AND $nottax"
);
$total += $a;
$regions{$label}->{'total'} += $a;
- foreach my $e ( grep { $r->get($_.'tax') =~ /^Y/i } qw( setup recur ) ) {
- my $x = scalar_sql($r,
+ 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 += $x;
$regions{$label}->{'exempt'} += $x;
}
- foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i } qw( setup recur ) ) {
- my $x = scalar_sql($r,
- "SELECT SUM($e) $fromwhere AND $nottax"
+ foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i }
+ qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
+ my $t = scalar_sql($r, \@param,
+ "SELECT SUM($e) $fromwhere AND $nottax AND ( tax != 'Y' OR tax IS NULL )"
);
- $taxable += $x;
- $regions{$label}->{'taxable'} += $x;
+ $taxable += $t;
+ $regions{$label}->{'taxable'} += $t;
+ $owed += $t * ($r->tax/100);
+ $regions{$label}->{'owed'} += $t * ($r->tax/100);
+
+ my $x = scalar_sql($r, \@param,
+ "SELECT SUM($e) $fromwhere AND $nottax AND tax = 'Y'"
+ );
+ $exempt += $x;
+ $regions{$label}->{'exempt'} += $x;
}
if ( defined($regions{$label}->{'rate'})
$regions{$label}->{'rate'} = $r->tax.'%';
}
+}
+
+my $taxwhere = "$from_join_cust $where";
+my @taxparam = @base_param;
+
+#foreach my $label ( keys %regions ) {
+foreach my $r (
+ qsearch( 'cust_main_county',
+ {},
+ 'DISTINCT ON (country, state, county, taxname) *',
+ $gotcust
+ )
+) {
+
+ #warn join('-', map { $r->$_() } qw( country state county taxname ) )."\n";
+
+ my $label = getlabel($r);
+
+ my $fromwhere = $join_pkg. $where;
+ my @param = @base_param;
+
#match itemdesc if necessary!
- my $named_tax = $r->taxname ? 'AND itemdesc = '. dbh->quote($r->taxname) : '';
- my $x = scalar_sql($r,
- "SELECT SUM(setup+recur) $fromwhere AND pkgnum = 0 $named_tax",
+ my $named_tax =
+ $r->taxname
+ ? 'AND itemdesc = '. dbh->quote($r->taxname)
+ : "AND itemdesc IS NULL or itemdesc = ''";
+ my $x = scalar_sql($r, \@taxparam,
+ "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $taxwhere ".
+ "AND pkgnum = 0 $named_tax",
);
$tax += $x;
$regions{$label}->{'tax'} += $x;
- $regions{$label}->{'label'} = $label;
-
}
#ordering
my @regions = map $regions{$_},
- sort { ( ($b eq $out) cmp ($a eq $out) ) || ($a cmp $b) }
+ sort { ( ($a eq $out) cmp ($b eq $out) ) || ($b cmp $a) }
keys %regions;
push @regions, {
#--
+sub getlabel {
+ my $r = shift;
+
+ my $label;
+ if ( $r->tax == 0 ) {
+ #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 );
+ } else {
+ $label = $r->country;
+ $label = $r->state.", $label" if $r->state;
+ $label = $r->county." county, $label" if $r->county;
+ #$label = $r->taxname. " ($label)" if $r->taxname;
+ }
+ return $label;
+}
+
#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 {
- my( $r, $sql ) = @_;
+ my( $r, $param, $sql ) = @_;
+ #warn "$sql\n";
my $sth = dbh->prepare($sql) or die dbh->errstr;
- $sth->execute( map $r->$_(), qw( county state country ) )
+ $sth->execute( map $r->$_(), @$param )
or die "Unexpected error executing statement $sql: ". $sth->errstr;
$sth->fetchrow_arrayref->[0] || 0;
}
<TH ROWSPAN=2></TH>
<TH COLSPAN=3>Sales</TH>
<TH ROWSPAN=2>Rate</TH>
- <TH ROWSPAN=2>Tax</TH>
+ <TH ROWSPAN=2>Tax owed</TH>
+ <TH ROWSPAN=2>Tax invoiced</TH>
</TR>
<TR>
<TH>Total</TH>
<% foreach my $region ( @regions ) { %>
<TR>
<TD><%= $region->{'label'} %></TD>
- <TD ALIGN="right">$<%= $region->{'total'} %></TD>
- <TD ALIGN="right">$<%= $region->{'exempt'} %></TD>
- <TD ALIGN="right">$<%= $region->{'taxable'} %></TD>
+ <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'total'} ) %></TD>
+ <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'exempt'} ) %></TD>
+ <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'taxable'} ) %></TD>
<TD ALIGN="right"><%= $region->{'rate'} %></TD>
- <TD ALIGN="right">$<%= $region->{'tax'} %></TD>
+ <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'owed'} ) %></TD>
+ <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'tax'} ) %></TD>
</TR>
<% } %>
projects / freeside.git / blobdiff