X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_pay_void.pm;h=fdb7c7f796f34eb0e9810d63fa27c6d3ddbdf373;hb=fcd1c0609410626f03936fb46c24d45a9cc61808;hp=e6e2159a7daa60235c828cd78975289affe3a81c;hpb=de27e71335e90813543e5c87025a6bce23bb7645;p=freeside.git

diff --git a/FS/FS/cust_pay_void.pm b/FS/FS/cust_pay_void.pm
index e6e2159a7..fdb7c7f79 100644
--- a/FS/FS/cust_pay_void.pm
+++ b/FS/FS/cust_pay_void.pm
@@ -135,12 +135,16 @@ sub unvoid {
     map { $_ => $self->get($_) } fields('cust_pay')
   } );
   my $error = $cust_pay->insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
+
+  my $cust_pay_pending =
+    qsearchs('cust_pay_pending', { void_paynum => $self->paynum });
+  if ( $cust_pay_pending ) {
+    $cust_pay_pending->set('paynum', $cust_pay->paynum);
+    $cust_pay_pending->set('void_paynum', '');
+    $error ||= $cust_pay_pending->replace;
   }
 
-  $error = $self->delete;
+  $error ||= $self->delete;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;