fix package balance conditions, RT#11834

[freeside.git] / FS / FS / cust_bill.pm

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index f673b76..dd8fab2 100644 (file)
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -681,11 +681,10 @@ sub cust_bill_pay_pkg {
   qsearch({
     'select'    => 'cust_bill_pay_pkg.*',
     'table'     => 'cust_bill_pay_pkg',
-    'addl_from' => ' LEFT JOIN cust_bill_pay USING billpaynum '.
-                   ' LEFT JOIN cust_bill_pkg USING billpkgnum ',
-    'hashref'   => { 'invnum' => $self->invnum,
-                     'pkgnum' => $pkgnum,
-                   },
+    'addl_from' => ' LEFT JOIN cust_bill_pay USING ( billpaynum ) '.
+                   ' LEFT JOIN cust_bill_pkg USING ( billpkgnum ) ',
+    'extra_sql' => ' WHERE invnum = '. $self->invnum.
+                   "   AND pkgnum = $pkgnum",
   });
 
 }
@@ -726,11 +725,10 @@ sub cust_credit_bill_pkg {
   qsearch({
     'select'    => 'cust_credit_bill_pkg.*',
     'table'     => 'cust_credit_bill_pkg',
-    'addl_from' => ' LEFT JOIN cust_credit_bill USING creditbillnum '.
-                   ' LEFT JOIN cust_bill_pkg    USING billpkgnum ',
-    'hashref'   => { 'invnum' => $self->invnum,
-                     'pkgnum' => $pkgnum,
-                   },
+    'addl_from' => ' LEFT JOIN cust_credit_bill USING ( creditbillnum ) '.
+                   ' LEFT JOIN cust_bill_pkg    USING ( billpkgnum    ) ',
+    'extra_sql' => ' WHERE invnum = '. $self->invnum.
+                   "   AND pkgnum = $pkgnum",
   });
 
 }