[freeside-commits] freeside/FS/FS/Cron bill.pm,1.2,1.2.2.1

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/Cron
In directory wavetail:/tmp/cvs-serv29815/FS/FS/Cron

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	bill.pm 
Log Message:
skycatcher modifications for pre-printing invoices, but with today's date

Index: bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Cron/bill.pm,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- bill.pm	21 Jan 2007 21:45:28 -0000	1.2
+++ bill.pm	9 Jun 2007 00:42:29 -0000	1.2.2.1
@@ -24,6 +24,8 @@
   my($time)= $opt{'d'} ? str2time($opt{'d'}) : $^T;
   $time += $opt{'y'} * 86400 if $opt{'y'};
 
+  my $invoice_time = $opt{'n'} ? $^T : $time;
+
   # select * from cust_main where
   my $where_pkg = <<"END";
     0 < ( select count(*) from cust_pkg
@@ -101,8 +103,9 @@
         if $error;
     }
   
-    my $error = $cust_main->bill( 'time'    => $time,
-                                  'resetup' => $opt{'s'},
+    my $error = $cust_main->bill( 'time'         => $time,
+                                  'invoice_time' => $invoice_time,
+                                  'resetup'      => $opt{'s'},
                                 );
     warn "Error billing, custnum ". $cust_main->custnum. ": $error" if $error;