X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Ftax_rate.pm;h=334c31e953e7549df45f42d86ea2125ef25aaecb;hb=71c4c439c4a5b414802802beabc8060986d4a065;hp=d8ee8752039a227836714a7032883b3d1cd5e026;hpb=2dced43b8c6083fa0ff7bbe2120c1387c8a2b604;p=freeside.git

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;