From: Mark Wells <mark@freeside.biz>
Date: Fri, 22 Mar 2013 21:52:14 +0000 (-0700)
Subject: fix warnings on upgrade, #22121
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=6a3667417caf5efcd06c3ded9da2df7021a38fe9;p=freeside.git

fix warnings on upgrade, #22121
---

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index fa5672cdd..6d09f8908 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -1033,13 +1033,17 @@ sub _upgrade_data {  #class method
 
   # not only cust_pay, but also voided and refunded payments
   if (!FS::upgrade_journal->is_done('cust_pay__parse_paybatch_1')) {
+    local $FS::Record::nowarn_classload=1;
     # really inefficient, but again, only has to run once
     foreach my $table (qw(cust_pay cust_pay_void cust_refund)) {
+      my $and_batchnum_is_null =
+        ( $table =~ /^cust_pay/ ? ' AND batchnum IS NULL' : '' );
       foreach my $object ( qsearch({
             table     => $table,
             extra_sql => "WHERE payby IN('CARD','CHEK') ".
                          "AND (paybatch IS NOT NULL ".
-                         "OR (paybatch IS NULL AND auth IS NULL) )",
+                         "OR (paybatch IS NULL AND auth IS NULL
+                         $and_batchnum_is_null ) )",
           }) )
       {
         if ( $object->paybatch eq '' ) {