X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_newtax.cgi;h=09c56ab3b5389334b86f6e31fa8734c48098c187;hb=6b5dda03831aef0cb5689cf2acf3fac47e4b12cb;hp=586fddd25a80572f808dd81eabe971fad509fd73;hpb=3a88582ed5708b0b0dd6c50c7227de8970b1344b;p=freeside.git
diff --git a/httemplate/search/report_newtax.cgi b/httemplate/search/report_newtax.cgi
index 586fddd25..09c56ab3b 100755
--- a/httemplate/search/report_newtax.cgi
+++ b/httemplate/search/report_newtax.cgi
@@ -15,7 +15,11 @@
|
- Tax collected |
+ |
+ Tax invoiced |
+ |
+ |
+ Tax credited |
% my $bgcolor1 = '#eeeeee';
% my $bgcolor2 = '#ffffff';
@@ -37,9 +41,17 @@
| <% $tax->{'label'} %> |
+ <% $tax->{base} ? qq! | ! : '' %>
<% $money_char %><% sprintf('%.2f', $tax->{'tax'} ) %>
|
+ <% !($tax->{base}) ? qq! | ! : '' %>
+ |
+ <% $tax->{base} ? qq! | ! : '' %>
+
+ <% $money_char %><% sprintf('%.2f', $tax->{'credit'} ) %>
+ |
+ <% !($tax->{base}) ? qq! | ! : '' %>
% }
@@ -52,6 +64,8 @@
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
+#shit, all sorts of false laxiness w/tax_rate::geneate_liability_report
+
my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
@@ -61,10 +75,11 @@ 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_loc = "LEFT JOIN cust_bill_pkg_tax_rate_location USING ( billpkgnum )";
+my $join_tax_loc = "LEFT JOIN tax_rate_location USING ( taxratelocationnum )";
+
+my $addl_from = " $join_cust $join_loc $join_tax_loc ";
my $where = "WHERE _date >= $beginning AND _date <= $ending ";
@@ -76,65 +91,105 @@ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
$where .= ' AND cust_main.agentnum = '. $agent->agentnum;
}
+#my @taxparam = ( 'itemdesc', 'tax_rate_location.state', 'tax_rate_location.county', 'tax_rate_location.city', 'cust_bill_pkg_tax_rate_location.locationtaxid' );
+my @taxparams = qw( city county state locationtaxid );
+my @params = ('itemdesc', @taxparams);
+
+my $select = 'DISTINCT itemdesc,locationtaxid,tax_rate_location.state,tax_rate_location.county,tax_rate_location.city';
+
my $tax = 0;
+my $credit = 0;
my %taxes = ();
+my %basetaxes = ();
foreach my $t (qsearch({ table => 'cust_bill_pkg',
+ select => $select,
hashref => { pkgpart => 0 },
- addl_from => $join_cust,
+ addl_from => $addl_from,
extra_sql => $where,
})
)
{
- #warn $t->itemdesc. "\n";
+ #my @params = map { my $f = $_; $f =~ s/.*\.//; $f } @taxparam;
+ my $label = join('~', map { $t->$_ } @params);
+ $label = 'Tax'. $label if $label =~ /^~/;
+ unless ( exists( $taxes{$label} ) ) {
+ my ($baselabel, @trash) = split /~/, $label;
- my $label = $t->itemdesc;
- $label ||= 'Tax';
- $taxes{$label}->{'label'} = $label;
- $taxes{$label}->{'url_param'} = "itemdesc=$label";
+ $taxes{$label}->{'label'} = join(', ', split(/~/, $label) );
+ $taxes{$label}->{'url_param'} =
+ join(';', map { "$_=". uri_escape($t->$_) } @params);
- # calculate total for this tax
- # calculate customer-exemption for this tax
- # calculate package-exemption for this tax
- # calculate monthly exemption (texas tax) for this tax
- # count up all the cust_tax_exempt_pkg records associated with
- # the actual line items.
-}
+ my $payby_itemdesc_loc =
+ " payby != 'COMP' ".
+ "AND ( itemdesc = ? OR ? = '' AND itemdesc IS NULL ) ".
+ "AND ". FS::tax_rate_location->location_sql( map { $_ => $t->$_ }
+ @taxparams
+ );
+ my $taxwhere =
+ "FROM cust_bill_pkg $addl_from $where AND $payby_itemdesc_loc";
-foreach my $t (qsearch({ table => 'cust_bill_pkg',
- select => 'DISTINCT itemdesc',
- hashref => { pkgpart => 0 },
- addl_from => $join_cust,
- extra_sql => $where,
- })
- )
-{
+ my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
+
+ my $x = scalar_sql($t, [ 'itemdesc', 'itemdesc' ], $sql );
+ $tax += $x;
+ $taxes{$label}->{'tax'} += $x;
+
+ my $creditfrom =
+ "JOIN cust_credit_bill_pkg USING (billpkgnum,billpkgtaxratelocationnum)";
+ my $creditwhere =
+ "FROM cust_bill_pkg $addl_from $creditfrom $where AND $payby_itemdesc_loc";
+
+ $sql = "SELECT SUM(cust_credit_bill_pkg.amount) ".
+ " $creditwhere AND cust_bill_pkg.pkgnum = 0";
+
+ my $y = scalar_sql($t, [ 'itemdesc', 'itemdesc' ], $sql );
+ $credit += $y;
+ $taxes{$label}->{'credit'} += $y;
- my $label = $t->itemdesc;
- $label ||= 'Tax';
- my @taxparam = ( 'itemdesc' );
- my $taxwhere = "$from_join_cust $where AND payby != 'COMP' ".
- "AND itemdesc = ?" ;
+ unless ( exists( $taxes{$baselabel} ) ) {
- my $sql = "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) ".
- " $taxwhere AND pkgnum = 0";
+ $basetaxes{$baselabel}->{'label'} = $baselabel;
+ $basetaxes{$baselabel}->{'url_param'} = "itemdesc=$baselabel";
+ $basetaxes{$baselabel}->{'base'} = 1;
- my $x = scalar_sql($t, \@taxparam, $sql );
- $tax += $x;
- $taxes{$label}->{'tax'} += $x;
+ }
+ $basetaxes{$baselabel}->{'tax'} += $x;
+ $basetaxes{$baselabel}->{'credit'} += $y;
+
+ }
+
+ # calculate customer-exemption for this tax
+ # calculate package-exemption for this tax
+ # calculate monthly exemption (texas tax) for this tax
+ # count up all the cust_tax_exempt_pkg records associated with
+ # the actual line items.
}
+
#ordering
-my @taxes =
- map $taxes{$_},
- sort { ($b cmp $a) }
- keys %taxes;
+my @taxes = ();
+
+foreach my $tax ( sort { $a cmp $b } keys %taxes ) {
+ my ($base, @trash) = split '~', $tax;
+ my $basetax = delete( $basetaxes{$base} );
+ if ($basetax) {
+ if ( $basetax->{tax} == $taxes{$tax}->{tax} ) {
+ $taxes{$tax}->{base} = 1;
+ } else {
+ push @taxes, $basetax;
+ }
+ }
+ push @taxes, $taxes{$tax};
+}
push @taxes, {
'label' => 'Total',
'url_param' => '',
'tax' => $tax,
+ 'credit' => $credit,
+ 'base' => 1,
};
#--
@@ -143,7 +198,6 @@ push @taxes, {
#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;
@@ -154,5 +208,6 @@ my $dateagentlink = "begin=$beginning;end=$ending";
$dateagentlink .= ';agentnum='. $cgi->param('agentnum')
if length($agentname);
my $baselink = $p. "search/cust_bill_pkg.cgi?$dateagentlink";
+my $creditlink = $p. "search/cust_credit_bill_pkg.html?$dateagentlink";