X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-daily;h=b73d0b11224b06b41a29b0cb23b67cbf54166ebc;hb=a3f549b03951a3f9710bfd51649edf6b028fb4ff;hp=2c9dd8b1ba88f7d9356c348e741e740a66622412;hpb=f6ec862de3441618ae8035db1b754d417c5cb1b0;p=freeside.git

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 2c9dd8b1b..b73d0b112 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -7,7 +7,7 @@ use FS::Conf;
 
 &untaint_argv;	#what it sounds like  (eww)
 use vars qw(%opt);
-getopts("p:a:d:vl:sy:nmrkg:u", \%opt);
+getopts("p:a:d:vl:sy:nmrkg:uo", \%opt);
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
@@ -16,6 +16,10 @@ adminsuidsetup $user;
 use FS::Cron::nms_report qw(nms_report);
 nms_report(%opt);
 
+#no way to skip this yet, but should be harmless/quick
+use FS::Cron::expire_banned_pay qw(expire_banned_pay);
+expire_banned_pay(%opt);
+
 #you can skip this by setting the disable_cron_billing config
 use FS::Cron::bill qw(bill);
 bill(%opt);
@@ -28,6 +32,9 @@ reconcile_breakage(%opt);
 use FS::Cron::upload qw(upload);
 upload(%opt);
 
+use FS::Cron::set_lata_have_usage qw(set_lata_have_usage);
+set_lata_have_usage(%opt);
+
 # Send alerts about upcoming credit card expiration.
 use FS::Cron::alert_expiration qw(alert_expiration);
 my $conf = new FS::Conf;
@@ -51,12 +58,12 @@ if ( $opt{u} ) {
 }
 
 #you can skip this just by not having the config
-use FS::Cron::backup qw(backup_scp);
-backup_scp();
+use FS::Cron::backup qw(backup);
+backup();
 
 #same
-use FS::Cron::rt_tasks qw(rt_escalate);
-rt_escalate(%opt);
+use FS::Cron::rt_tasks qw(rt_daily);
+rt_daily(%opt);
 
 my $deldir = "$FS::UID::cache_dir/cache.$FS::UID::datasrc/";
 unlink <${deldir}.invoice*>;
@@ -90,7 +97,7 @@ freeside-daily - Run daily billing and invoice collection events.
 
 =head1 SYNOPSIS
 
-  freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum,agentnum,... ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -r ] [ -k ] user [ custnum custnum ... ]
+  freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum,agentnum,... ] [ -s ] [ -o ] [ -v ] [ -l level ] [ -m ] [ -r ] [ -k ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -121,6 +128,8 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -s: re-charge setup fees
 
+  -o: For packages which are more than one billing period behind, only charge for one billing period rather than catching up.
+
   -v: enable debugging
 
   -l: debugging level