[freeside-commits] branch FREESIDE_3_BRANCH updated. c8247c2214b7246a2be5796ba971ed09d7370228

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  c8247c2214b7246a2be5796ba971ed09d7370228 (commit)
      from  59e04eed431d9579e8a8f417f5508e5c251d0831 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c8247c2214b7246a2be5796ba971ed09d7370228
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Oct 24 21:58:47 2013 -0700

    fix next-bill-ignore-time, RT#24318, RT#24476, RT#12570

diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm
index e170f09..1e11b57 100644
--- a/FS/FS/cust_main/Billing.pm
+++ b/FS/FS/cust_main/Billing.pm
@@ -373,6 +373,11 @@ sub bill {
   my $time = $options{'time'} || time;
   my $invoice_time = $options{'invoice_time'} || $time;
 
+  my $cmp_time = ( $conf->exists('next-bill-ignore-time')
+                     ? day_end( $time )
+                     : $time
+                 );
+
   $options{'not_pkgpart'} ||= {};
   $options{'not_pkgpart'} = { map { $_ => 1 }
                                   split(/\s*,\s*/, $options{'not_pkgpart'})
@@ -480,7 +485,7 @@ sub bill {
       my $next_bill = $cust_pkg->getfield('bill') || 0;
       my $error;
       # let this run once if this is the last bill upon cancellation
-      while ( $next_bill <= $time or $options{cancel} ) {
+      while ( $next_bill <= $cmp_time or $options{cancel} ) {
         $error =
           $self->_make_lines( 'part_pkg'            => $part_pkg,
                               'cust_pkg'            => $cust_pkg,

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_main/Billing.pm |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)