diff options
author | ivan <ivan> | 2011-02-10 01:20:03 +0000 |
---|---|---|
committer | ivan <ivan> | 2011-02-10 01:20:03 +0000 |
commit | 5a4db25ecf6a56c0777c52c4d172c675dad0791b (patch) | |
tree | 9c9cb2a3bc17e8e8d964bfecd0f3300d11015987 /FS/FS/tax_rate.pm | |
parent | 406b21cab11a2a89f359d40d10d6b37e60eddc1e (diff) |
fix cch tax report for more than one cust_bill_pkg_tax_rate_location per line item, RT#11483
Diffstat (limited to 'FS/FS/tax_rate.pm')
-rw-r--r-- | FS/FS/tax_rate.pm | 4 |
1 files changed, 2 insertions, 2 deletions
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; |