summaryrefslogtreecommitdiff
path: root/FS
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2013-03-22 14:52:14 -0700
committerMark Wells <mark@freeside.biz>2013-03-22 14:52:14 -0700
commit6a3667417caf5efcd06c3ded9da2df7021a38fe9 (patch)
treeee3f2f9f0f2387e36443388f074d3f693fb6be6d /FS
parent686ecf55b716396505eefde07593d7de3a423751 (diff)
fix warnings on upgrade, #22121
Diffstat (limited to 'FS')
-rw-r--r--FS/FS/cust_pay.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index fa5672c..6d09f89 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 '' ) {