From: ivan <ivan>
Date: Thu, 10 Feb 2011 01:20:06 +0000 (+0000)
Subject: fix cch tax report for more than one cust_bill_pkg_tax_rate_location per line item... 
X-Git-Tag: freeside_2_1_2~64
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=2d51b8881bdf8e15a9bafc716641346c94a127db

fix cch tax report for more than one cust_bill_pkg_tax_rate_location per line item, RT#11483
---

diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index d8ee87520..334c31e95 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -1806,6 +1806,7 @@ agentnum, beginning, and ending
 
 =cut
 
+#shit, all sorts of false laxiness w/report_newtax.cgi
 sub generate_liability_report {
   my %args = @_;
 
@@ -1897,8 +1898,7 @@ sub generate_liability_report {
       my $taxwhere = "FROM cust_bill_pkg $addl_from $where AND payby != 'COMP' ".
         "AND ". join( ' AND ', map { "( $_ = ? OR ? = '' AND $_ IS NULL)" } @taxparam );
 
-      my $sql = "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) ".
-                " $taxwhere AND cust_bill_pkg.pkgnum = 0";
+      my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
 
       my $x = &{$scalar_sql}($t, [ map { $_, $_ } @params ], $sql );
       $tax += $x;
diff --git a/httemplate/search/report_newtax.cgi b/httemplate/search/report_newtax.cgi
index 78514624c..559d89ded 100755
--- a/httemplate/search/report_newtax.cgi
+++ b/httemplate/search/report_newtax.cgi
@@ -123,8 +123,7 @@ foreach my $t (qsearch({ table     => 'cust_bill_pkg',
     my $taxwhere = "FROM cust_bill_pkg $addl_from $where AND payby != 'COMP' ".
       "AND ". join( ' AND ', map { "( $_ = ? OR ? = '' AND $_ IS NULL)" } @taxparam );
 
-    my $sql = "SELECT SUM(COALESCE(amount, cust_bill_pkg.setup+cust_bill_pkg.recur)) ".
-              " $taxwhere AND cust_bill_pkg.pkgnum = 0";
+    my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
 
     my $x = scalar_sql($t, [ map { $_, $_ } @params ], $sql );
     $tax += $x;