X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-monthly;h=7be3776fc1ab3d45cb05909488261b9f4adebf22;hp=a6c75e715499e974ee38d80299f8e2243400ce7a;hb=ac8410cdb67639afeb84c84e975fffadf3e6cce1;hpb=c8cccb4a92adceb943c635fe62dad0d034462ce0

diff --git a/FS/bin/freeside-monthly b/FS/bin/freeside-monthly
index a6c75e715..7be3776fc 100755
--- a/FS/bin/freeside-monthly
+++ b/FS/bin/freeside-monthly
@@ -7,13 +7,20 @@ use FS::UID qw(adminsuidsetup);
 &untaint_argv;	#what it sounds like  (eww)
 #use vars qw($opt_d $opt_v $opt_p $opt_a $opt_s $opt_y);
 use vars qw(%opt);
-getopts("p:a:d:vsy:", \%opt);
+getopts("p:a:d:vsy:m", \%opt);
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
 
+die "The -p option has been removed in version 4 -- customers no longer have ".
+    "a single, specific payment type"
+  if $opt{'p'};
+
 use FS::Cron::bill qw(bill);
-bill(%opt, 'freq'=>'1m' );
+bill(%opt, 'check_freq'=>'1m' );
+
+use FS::Cron::upload qw(upload);
+upload(%opt);
 
 ###
 # subroutines
@@ -42,7 +49,7 @@ freeside-monthly - Run monthly billing and invoice collection events.
 
 =head1 SYNOPSIS
 
-  freeside-monthly [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] user [ custnum custnum ... ]
+  freeside-monthly [ -d 'date' ] [ -y days ] [ -a agentnum ] [ -s ] [ -v ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -61,7 +68,7 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
       "pretend date" 15 days from whatever was specified by the -d switch
       (or now, if no -d switch was given).
 
-  -p: Only process customers with the specified payby (I<CARD>, I<DCRD>, I<CHEK>, I<DCHK>, I<BILL>, I<COMP>, I<LECB>)
+  -p: Deprecated, will produce a fatal error (formerly was: Only process customers with the specified payby (CARD, DCRD, CHEK, DCHK, BILL, COMP, LECB))
 
   -a: Only process customers with the specified agentnum
 
@@ -69,7 +76,9 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -v: enable debugging
 
-user: From the mapsecrets file - see config.html from the base documentation
+  -m: Experimental multi-process mode (delay upload jobs until billing jobs complete)
+
+user: Typically "fs_daily"
 
 custnum: if one or more customer numbers are specified, only bills those
 customers.  Otherwise, bills all customers.