sub owed_sql {
my ($class, $start, $end, %opt) = @_;
my $charged =
- $opt{setuprecur} =~ /^s/ ? 'setup' :
- $opt{setuprecur} =~ /^r/ ? 'recur' :
- 'setup + recur';
+ $opt{setuprecur} =~ /^s/ ? 'cust_bill_pkg.setup' :
+ $opt{setuprecur} =~ /^r/ ? 'cust_bill_pkg.recur' :
+ 'cust_bill_pkg.setup + cust_bill_pkg.recur';
if ( $opt{no_usage} ) {
$charged .= ' - ' . $class->usage_sql;
if ( $unearned ) {
$count_query .= "SUM( $unearned_base ), SUM( $unearned_sql )";
} elsif ( $use_usage eq 'recurring' ) {
- $count_query .= "SUM(setup + recur - usage)";
+ $count_query .= "SUM(cust_bill_pkg.setup + cust_bill_pkg.recur - usage)";
} elsif ( $use_usage eq 'usage' ) {
$count_query .= "SUM(usage)";
} elsif ( scalar( grep( /locationtaxid/, $cgi->param ) ) ) {