X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=124e5d8192732e4b70ce8133738a68b5d185f058;hb=06fd3d9f3ca53b2d2f7595e55be4b129ca69511c;hp=885c764da408cf13f1398748bb48eaf69905fb00;hpb=5f69e7b4fa45c720a366eee314379ba10d5f8d34;p=freeside.git
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 885c764da..124e5d819 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -1,194 +1,210 @@
-
-<%
-
-my $user = getotaker;
-
-$cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
-my $pbeginning = $1;
-my $beginning = $1 ? str2time($1) : 0;
-
-$cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
-my $pending = $1;
-my $ending = ( $1 ? str2time($1) : 4294880896 ) + 86399;
-
-my($total, $exempt, $taxable, $tax) = ( 0, 0, 0, 0 );
-my $out = 'Out of taxable region(s)';
-my %regions;
-foreach my $r (
- qsearch('cust_main_county', {}, '',
- "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
- )"
- )
-) {
- #warn $r->county. ' '. $r->state. ' '. $r->country. "\n";
- 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;
- }
-
- 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 $taxwhere = my $fromwhere = "
- FROM cust_bill_pkg
- JOIN cust_bill USING ( invnum )
- JOIN cust_main USING ( custnum )
- ";
-
- $fromwhere .= $join_pkg. $where;
- $taxwhere .= $where;
-
- my @taxparam = my @param = qw( county county state state country );
-
-# my $num_others =
-# scalar_sql( $r, [qw( country state state county county taxname taxname )],
-# "SELECT COUNT(*) FROM cust_main_county
-# WHERE country = ?
-# AND ( state = ? OR ( state IS NULL AND ? = '' ) )
-# AND ( county = ? OR ( county IS NULL AND ? = '' ) )
-# AND ( taxname = ? OR ( taxname IS NULL AND ? = '' ) ) "
-# );
-#
-# die "didn't even find self?" unless $num_others;
-
- if ( $r->taxclass ) {
- $fromwhere .= " AND ( taxclass = ? ) ";
- push @param, 'taxclass';
- }
-
- my $nottax = 'pkgnum != 0';
-
- 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( 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( 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 += $t;
- $regions{$label}->{'taxable'} += $t;
-
- 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.'%' ) {
- $regions{$label}->{'rate'} = 'variable';
- } else {
- $regions{$label}->{'rate'} = $r->tax.'%';
- }
-
- #match itemdesc if necessary!
- my $named_tax = $r->taxname ? 'AND itemdesc = '. dbh->quote($r->taxname) : '';
- 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;
+<& /elements/header.html, $report->title &>
+
+Download full results
+as Excel spreadsheet
+ |
+
+
+<& /elements/table-grid.html &>
+
+
+ |
+ Sales |
+ |
+ Rate |
+ |
+ Estimated tax |
+ Tax invoiced |
+ |
+ Tax credited |
+ |
+ Net tax due |
+
+
+
+ Total |
+ Non-taxable |
+ Non-taxable |
+ Non-taxable |
+ Taxable |
+
+
+
+ (tax-exempt customer) |
+ (tax-exempt package) |
+ (monthly exemption) |
+
+
+
+% my $rownum = 0;
+% my $prev_row = { pkgclass => 'DUMMY PKGCLASS' };
+
+
+% foreach my $row (@rows) {
+% # before anything else: if this row's pkgclass is not the same as the
+% # previous row's, then:
+% if ( $row->{pkgclass} ne $prev_row->{pkgclass} ) {
+% if ( $rownum > 0 ) { # start a new section
+% $rownum = 0;
+
+% }
+% if ( $params{breakdown}->{pkgclass} ) { # and caption the new section
+
+
+ <% $pkgclass_name{$row->{pkgclass}} %>
+ |
+
+% }
+% } # if $row->{pkgclass} ne ...
+
+% # construct base links that limit to the tax rates described by this row
+% my $rowlink = ';taxnum=' . $row->{taxnums};
+% # and also the package class, if we're limiting package class
+% $rowlink .= ';pkgclass='.$row->{pkgclass}
+% if $params{breakdown}->{pkgclass};
+%
+% if ( $row->{total} ) {
+
+% }
+
+% # Row label
+ <% $row->{label} |h %> |
+
+% # Total sales
+
+ <% $money_sprintf->( $row->{sales} ) %>
+
+ |
+% # Exemptions: customer
+
+
+ <% $money_sprintf->( $row->{exempt_cust} ) %>
+
+ |
+% # package
+
+
+ <% $money_sprintf->( $row->{exempt_pkg} ) %>
+
+ |
+% # monthly (note this uses $exemptlink; it's a completely separate report)
+
+
+ <% $money_sprintf->( $row->{exempt_monthly} ) %>
+
+ |
+% # taxable sales
+
+ ">
+ <% $money_sprintf->( $row->{taxable} ) %>
+
+ |
+ × |
+ <% $row->{rate} %> |
+% # estimated tax
+ = |
+
+% if ( $row->{estimated} ) {
+ <% $money_sprintf->( $row->{estimated} ) %>
+% }
+ |
+% # invoiced tax
+
+
+ <% $money_sprintf->( $row->{tax} ) %>
+
+ |
+% # credited tax
+ − |
+
+
+ <% $money_sprintf->( $row->{credit} ) %>
+
+ |
+% # net tax due
+ = |
+ <% $money_sprintf->( $row->{tax} - $row->{credit} ) %> |
+
+% $rownum++;
+% $prev_row = $row;
+% } # foreach my $row
+
+
+<& /elements/footer.html &>
+<%init>
+
+die "access denied"
+ unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
+my $DEBUG = $cgi->param('debug') || 0;
+
+my $conf = new FS::Conf;
+
+my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
+
+my %params = (
+ beginning => $beginning,
+ ending => $ending,
+);
+$params{country} = $cgi->param('country');
+$params{debug} = $DEBUG;
+$params{breakdown} = { map { $_ => 1 } $cgi->param('breakdown') };
+
+my $agentname;
+if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+ my $agent = FS::agent->by_key($1) or die "unknown agentnum $1";
+ $params{agentnum} = $1;
+ $agentname = $agent->agentname;
}
-#ordering
-my @regions = map $regions{$_},
- sort { ( ($a eq $out) cmp ($b eq $out) ) || ($b cmp $a) }
- keys %regions;
-
-push @regions, {
- 'label' => 'Total',
- 'total' => $total,
- 'exempt' => $exempt,
- 'taxable' => $taxable,
- 'rate' => '',
- 'tax' => $tax,
-};
+if ( $cgi->param('taxname') =~ /^([\w ]+)$/ ) {
+ $params{taxname} = $1;
+} else {
+ die "taxname required";
+}
-#--
-
-#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, $param, $sql ) = @_;
- #warn "$sql\n";
- my $sth = dbh->prepare($sql) or die dbh->errstr;
- $sth->execute( map $r->$_(), @$param )
- or die "Unexpected error executing statement $sql: ". $sth->errstr;
- $sth->fetchrow_arrayref->[0] || 0;
+if ( $cgi->param('credit_date') eq 'cust_credit_bill' ) {
+ $params{credit_date} = 'cust_credit_bill';
+} else {
+ $params{credit_date} = 'cust_bill';
}
-%>
+warn "PARAMS:\n".Dumper(\%params)."\n\n" if $DEBUG;
-<%= header( "Sales Tax Report - $pbeginning through ".($pending||'now'),
- menubar( 'Main Menu'=>$p, ) ) %>
-<%= table() %>
-
- |
- Sales |
- Rate |
- Tax |
-
-
- Total |
- Non-taxable |
- Taxable |
-
- <% foreach my $region ( @regions ) { %>
-
- <%= $region->{'label'} %> |
- $<%= sprintf('%.2f', $region->{'total'} ) %> |
- $<%= sprintf('%.2f', $region->{'exempt'} ) %> |
- $<%= sprintf('%.2f', $region->{'taxable'} ) %> |
- <%= $region->{'rate'} %> |
- $<%= sprintf('%.2f', $region->{'tax'} ) %> |
-
- <% } %>
+my $report = FS::Report::Tax->report_internal(%params);
+my @rows = $report->table; # array of hashrefs
-
+my $money_char = $conf->config('money_char') || '$';
+my $money_sprintf = sub {
+ $money_char. sprintf('%.2f', shift);
+};
+
+my $dateagentlink = "begin=$beginning;end=$ending";
+$dateagentlink .= $params{agentnum} if $params{agentnum};
+my $saleslink = $p. "search/cust_bill_pkg.cgi?$dateagentlink;nottax=1";
+my $taxlink = $p. "search/cust_bill_pkg.cgi?$dateagentlink;istax=1";
+my $exemptlink = $p. "search/cust_tax_exempt_pkg.cgi?$dateagentlink";
+my $creditlink = $p. "search/cust_bill_pkg.cgi?$dateagentlink;credit=1;istax=1";
-