fix small problems with earlier commit: add back earlier commits reverted by this patch, also revert gratuitous whitespace changes

1 files changed, 5 insertions, 6 deletions

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 38fbae524..efcbfb3cc 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -44,7 +44,7 @@ sub bill {
                   )
         )
 END
-  
+
   my $where_event = join(' OR ', map {
     my $eventtable = $_;
 
@@ -76,7 +76,7 @@ END
 
   my $extra_sql = ( scalar(%search) ? ' AND ' : ' WHERE ' ).
                   "( $where_pkg OR $where_event )";
-  
+
   my @cust_main;
   if ( @ARGV ) {
     @cust_main = map { qsearchs('cust_main', { custnum => $_, %search } ) } @ARGV
@@ -95,8 +95,7 @@ END
 
   }
   
-  my($cust_main,%saw);
-  foreach $cust_main ( @cust_main ) {
+  foreach my $cust_main ( @cust_main ) {
 
     if ( $opt{'m'} ) {
 
@@ -106,7 +105,7 @@ END
           'secure' => 'Y',
         };
         my $error = $queue->insert(
-        'custnum'      =>  $cust_main->custnum,
+        'custnum'      => $cust_main->custnum,
         'time'         => $time,
         'invoice_time' => $invoice_time,
         'check_freq'   => $check_freq,
@@ -123,7 +122,7 @@ END
       );
 
     }
-  
+
   }
 
 }