} else {
- $count_query = "SELECT COUNT(*), ";
+ if ( $use_usage ) {
+ $count_query = "SELECT COUNT(*), ";
+ } else {
+ $count_query = "SELECT COUNT(DISTINCT billpkgnum), ";
+ }
if ( $use_usage eq 'recurring' ) {
$count_query .= "SUM(setup + recur - usage)";
$count_query .= "SUM(usage)";
} elsif ( $unearned ) {
$count_query .= "SUM(cust_bill_pkg.recur)";
+ } elsif ( scalar( grep( /locationtaxid/, $cgi->param ) ) ) {
+ $count_query .= "SUM( COALESCE(cust_bill_pkg_tax_rate_location.amount, cust_bill_pkg.setup + cust_bill_pkg.recur))";
+ } elsif ( $cgi->param('iscredit') eq 'rate') {
+ $count_query .= "SUM( cust_credit_bill_pkg.amount )";
} else {
$count_query .= "SUM(cust_bill_pkg.setup + cust_bill_pkg.recur)";
}