[freeside-commits] freeside/FS/FS bill_batch.pm,1.1.4.2,1.1.4.3

[Mark Wells]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	bill_batch.pm 
Log Message:
rearrange flow of batch download, #947

Index: bill_batch.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/bill_batch.pm,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -w -d -r1.1.4.2 -r1.1.4.3
--- bill_batch.pm	20 Jan 2011 03:58:36 -0000	1.1.4.2
+++ bill_batch.pm	30 Jul 2011 23:20:36 -0000	1.1.4.3
@@ -80,6 +80,7 @@
       die $error if $error;
     }
   }
+  $job->update_statustext(100, 'Combining invoices') if $job;
 
   return $pdf_out->toPDF;
 }
@@ -128,6 +129,11 @@
   my $batch = FS::bill_batch->by_key($param->{batchnum});
   die "batch '$param->{batchnum}' not found!\n" if !$batch;
 
+  if ( $param->{'close'} ) {
+    my $error = $batch->close;
+    die $error if $error;
+  }
+
   my $pdf = $batch->print_pdf($job);
   $batch->pdf($pdf);
   my $error = $batch->replace;