[freeside-commits] freeside/httemplate/edit/process cust_main.cgi, 1.32.2.1, 1.32.2.2

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit/process
In directory wavetail:/tmp/cvs-serv6059/httemplate/edit/process

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	cust_main.cgi 
Log Message:
fix race condition where ->apply_payments_and_credits could double-apply in rare cases

Index: cust_main.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/process/cust_main.cgi,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -u -d -r1.32.2.1 -r1.32.2.2
--- cust_main.cgi	24 Apr 2007 22:36:24 -0000	1.32.2.1
+++ cust_main.cgi	13 Jul 2007 23:52:32 -0000	1.32.2.2
@@ -145,9 +145,9 @@
 %  my $conf = new FS::Conf;
 %  if ( $conf->exists('backend-realtime') && ! $error ) {
 %
-%    my $berror = $new->bill;
-%    $new->apply_payments_and_credits;
-%    $berror ||= $new->collect( 'realtime' => 1 );
+%    my $berror =    $new->bill
+%                 || $new->apply_payments_and_credits
+%                 || $new->collect( 'realtime' => 1 );
 %    warn "Warning, error billing during backend-realtime: $berror" if $berror;
 %
 %  }