[freeside-commits] freeside/FS/FS pay_batch.pm,1.26.2.7,1.26.2.8

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv10015

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	pay_batch.pm 
Log Message:
fix batch closure, #12351

Index: pay_batch.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/pay_batch.pm,v
retrieving revision 1.26.2.7
retrieving revision 1.26.2.8
diff -u -w -d -r1.26.2.7 -r1.26.2.8
--- pay_batch.pm	15 Feb 2011 23:52:44 -0000	1.26.2.7
+++ pay_batch.pm	12 Apr 2011 01:25:23 -0000	1.26.2.8
@@ -383,14 +383,16 @@
 
   } # foreach (@all_values)
 
+  my $close = 1;
   if ( defined($close_condition) ) {
     # Allow the module to decide whether to close the batch.
     # $close_condition can also die() to abort the whole import.
-    my $close = eval { $close_condition->($self) };
+    $close = eval { $close_condition->($self) };
     if ( $@ ) {
       $dbh->rollback;
       die $@;
     }
+  }
     if ( $close ) {
       my $error = $self->set_status('R');
       if ( $error ) {
@@ -398,7 +400,6 @@
         return $error;
       }
     }
-  }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';