[freeside-commits] freeside/FS/FS/cust_main Billing.pm, 1.38.2.6, 1.38.2.7

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	Billing.pm 
Log Message:
add -o flag to freeside-daily, to only bill for one month, RT#14904

Index: Billing.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main/Billing.pm,v
retrieving revision 1.38.2.6
retrieving revision 1.38.2.7
diff -u -w -d -r1.38.2.6 -r1.38.2.7
--- Billing.pm	26 Dec 2011 20:24:41 -0000	1.38.2.6
+++ Billing.pm	26 Dec 2011 21:18:25 -0000	1.38.2.7
@@ -420,11 +420,17 @@
                               'real_pkgpart'        => $real_pkgpart,
                               'options'             => \%options,
                             );
-        # Stop if anything goes wrong, or if we're not incrementing 
-        # the bill date.
+
+        # Stop if anything goes wrong
         last if $error;
+
+        # or if we're not incrementing the bill date.
         last if ($cust_pkg->getfield('bill') || 0) == $next_bill;
+
         $next_bill = $cust_pkg->getfield('bill') || 0;
+
+        #stop if -o was passed to freeside-daily
+        last if $options{'one_recur'};
       }
       if ($error) {
         $dbh->rollback if $oldAutoCommit && !$options{no_commit};