calculate owed as subquery here too

[freeside.git] / httemplate / search / cust_bill.cgi

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 6eba4bd..d2a3573 100755 (executable)
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -68,7 +68,7 @@ if ( $cgi->keywords ) {
     die "unknown query string $query";
   }
 
-  my $extra_sql = scalar(@where) ? join(' AND ', @where) : '';
+  my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : '';
 
   my $statement = "SELECT COUNT(*) FROM cust_bill $extra_sql";
   my $sth = dbh->prepare($statement) or die dbh->errstr. " doing $statement";
@@ -79,9 +79,7 @@ if ( $cgi->keywords ) {
   @cust_bill = qsearch(
     'cust_bill',
     {},
-    'cust_bill.*,
-     charged - coalesce(sum(cust_bill_pay.amount),0)
-              - coalesce(sum(cust_credit_bill.amount),0) as owed',
+    "cust_bill.*, $owed as owed"
     "$extra_sql $orderby $limit"
   );
 } else {