From 4d6c585ae38708a210e331af82b427cd88c465c7 Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Wed, 6 Mar 2013 13:04:58 -0800
Subject: [PATCH] fix payment lookup when revoking batch payments, #18548 and
 #21117

---
 FS/FS/cust_pay_batch.pm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index 1db74ef71..30ddc3762 100644
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -342,6 +342,11 @@ sub decline {
     if ( lc($old->status) eq 'approved' ) {
       # Void the payment
       my $cust_pay = qsearchs('cust_pay', { 
+          custnum  => $new->custnum,
+          batchnum => $new->batchnum
+        });
+      # pre-3.0 style
+      $cust_pay ||= qsearchs('cust_pay', { 
           custnum  => $new->custnum,
           paybatch => $new->batchnum
         });
-- 
2.20.1