X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_newtax.cgi;h=09c56ab3b5389334b86f6e31fa8734c48098c187;hb=143ea0473ca61fa5e2d7eea4da3d6b63505cacec;hp=fee88c99521ebad0fca2f366096ff8f1cbfd3dec;hpb=f42a474e970ceddc647da8a4bd4f4bc0e5778e29;p=freeside.git
diff --git a/httemplate/search/report_newtax.cgi b/httemplate/search/report_newtax.cgi
index fee88c995..09c56ab3b 100755
--- a/httemplate/search/report_newtax.cgi
+++ b/httemplate/search/report_newtax.cgi
@@ -16,7 +16,7 @@
|
|
- Tax collected |
+ Tax invoiced |
|
|
Tax credited |
@@ -91,12 +91,9 @@ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
$where .= ' AND cust_main.agentnum = '. $agent->agentnum;
}
-# my ( $location_sql, @location_param ) = FS::cust_pkg->location_sql;
-# $where .= " AND $location_sql";
-#my @taxparam = ( 'itemdesc', @location_param );
-# now something along the lines of geocode matching ?
-#$where .= FS::cust_pkg->_location_sql_where('cust_tax_location');;
-my @taxparam = ( 'itemdesc', 'tax_rate_location.state', 'tax_rate_location.county', 'tax_rate_location.city', 'cust_bill_pkg_tax_rate_location.locationtaxid' );
+#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';
@@ -112,7 +109,7 @@ foreach my $t (qsearch({ table => 'cust_bill_pkg',
})
)
{
- my @params = map { my $f = $_; $f =~ s/.*\.//; $f } @taxparam;
+ #my @params = map { my $f = $_; $f =~ s/.*\.//; $f } @taxparam;
my $label = join('~', map { $t->$_ } @params);
$label = 'Tax'. $label if $label =~ /^~/;
unless ( exists( $taxes{$label} ) ) {
@@ -122,24 +119,31 @@ foreach my $t (qsearch({ table => 'cust_bill_pkg',
$taxes{$label}->{'url_param'} =
join(';', map { "$_=". uri_escape($t->$_) } @params);
- my $taxwhere = "FROM cust_bill_pkg $addl_from $where AND payby != 'COMP' ".
- "AND ". join( ' AND ', map { "( $_ = ? OR ? = '' AND $_ IS NULL)" } @taxparam );
+ 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";
my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
- my $x = scalar_sql($t, [ map { $_, $_ } @params ], $sql );
+ 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 != 'COMP' ".
- "AND ". join( ' AND ', map { "( $_ = ? OR ? = '' AND $_ IS NULL)" } @taxparam );
+ 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, [ map { $_, $_ } @params ], $sql );
+ my $y = scalar_sql($t, [ 'itemdesc', 'itemdesc' ], $sql );
$credit += $y;
$taxes{$label}->{'credit'} += $y;