X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=124e5d8192732e4b70ce8133738a68b5d185f058;hb=d883a843dcfce64caeddd2a4abb0982c16a17199;hp=b73910a48060bcdab89b6776ab57d360dab95568;hpb=113de1f1167d9bc194e467b14a9d2f7f673d687f;p=freeside.git
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index b73910a48..124e5d819 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -1,341 +1,210 @@
-<%
-
-my $user = getotaker;
-
-my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
-
-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 $agentname = '';
-if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
- my $agent = qsearchs('agent', { 'agentnum' => $1 } );
- die "agent not found" unless $agent;
- $agentname = $agent->agent;
- $where .= ' AND agentnum = '. $agent->agentnum;
+<& /elements/header.html, $report->title &>
+
+% }
+
+% # 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
+
-my $taxwhere = "$from_join_cust $where";
-my @taxparam = @base_param;
+<& /elements/footer.html &>
+<%init>
-#foreach my $label ( keys %regions ) {
-foreach my $r (
- qsearch( 'cust_main_county',
- {},
- 'DISTINCT ON (country, state, county, taxname) *',
- $gotcust
- )
-) {
+die "access denied"
+ unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
- #warn join('-', map { $r->$_() } qw( country state county taxname ) )."\n";
+my $DEBUG = $cgi->param('debug') || 0;
- my $label = getlabel($r);
+my $conf = new FS::Conf;
- my $fromwhere = $join_pkg. $where;
- my @param = @base_param;
+my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
- #match itemdesc if necessary!
- my $named_tax =
- $r->taxname
- ? 'AND itemdesc = '. dbh->quote($r->taxname)
- : "AND ( itemdesc IS NULL OR itemdesc = '' OR itemdesc = 'Tax' )";
- 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;
+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',
- 'url_param' => '',
- 'total' => $total,
- 'exempt_cust' => $exempt_cust,
- 'exempt_pkg' => $exempt_pkg,
- 'exempt_monthly' => $exempt_monthly,
- 'taxable' => $tot_taxable,
- 'rate' => '',
- 'owed' => $owed,
- 'tax' => $tax,
-};
-
-#--
-
-sub getlabel {
- my $r = shift;
-
- my $label;
- if (
- $r->tax == 0
- && ! scalar( qsearch('cust_main_county', { 'state' => $r->state,
- 'county' => $r->county,
- 'country' => $r->country,
- 'tax' => { op=>'>', value=>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 = "$label (". $r->taxclass. ")" if $r->taxclass;
- #$label = $r->taxname. " ($label)" if $r->taxname;
- }
- return $label;
+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;
-my $baselink = $p. "search/cust_bill_pkg.cgi?begin=$beginning;end=$ending";
+my $report = FS::Report::Tax->report_internal(%params);
+my @rows = $report->table; # array of hashrefs
-%>
-
-
-<%= header( "$agentname Sales Tax Report - ".
- time2str('%h %o %Y through ', $beginning ).
- ( $cgi->param('ending') == 4294967295
- ? 'now'
- : time2str('%h %o %Y', $ending )
- ),
- menubar( 'Main Menu'=>$p, )
- )
-%>
-
-<%= include('/elements/table-grid.html') %>
-
-
- |
- Sales |
- Rate |
- Tax owed |
- Tax invoiced |
-
-
- Total |
- Non-taxable (tax-exempt customer) |
- Non-taxable (tax-exempt package) |
- Non-taxable (monthly exemption) |
- Taxable |
-
-
-<% my $bgcolor1 = '#eeeeee';
- my $bgcolor2 = '#ffffff';
- my $bgcolor;
-%>
-
- <% foreach my $region ( @regions ) {
-
- if ( $bgcolor eq $bgcolor1 ) {
- $bgcolor = $bgcolor2;
- } else {
- $bgcolor = $bgcolor1;
- }
-
- my $link = $baselink;
- if ( $region->{'label'} ne 'Total' ) {
- if ( $region->{'label'} eq $out ) {
- $link .= ';out=1';
- } else {
- $link .= ';'. $region->{'url_param'};
- }
- }
- %>
-
- <%= $region->{'label'} %> |
-
- $<%= sprintf('%.2f', $region->{'total'} ) %>
- |
-
- $<%= sprintf('%.2f', $region->{'exempt_cust'} ) %>
- |
-
- $<%= sprintf('%.2f', $region->{'exempt_pkg'} ) %>
- |
-
- $<%= sprintf('%.2f', $region->{'exempt_monthly'} ) %>
- |
-
- $<%= sprintf('%.2f', $region->{'taxable'} ) %>
- |
- <%= $region->{'rate'} %> |
-
- $<%= sprintf('%.2f', $region->{'owed'} ) %>
- |
-
- $<%= sprintf('%.2f', $region->{'tax'} ) %>
- |
-
- <% } %>
-
-
+my $money_char = $conf->config('money_char') || '$';
+my $money_sprintf = sub {
+ $money_char. sprintf('%.2f', shift);
+};
-<% if ( $monthly_exempt_warning ) { %>
-
- 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).
-<% } %>
+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";
-