X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fprorate_Mixin.pm;h=380f0b0298079b18ca5f2b3822a889301bdf8556;hp=7d68be0bd42f1eacc0f8817650bd17af77959281;hb=f5749f6de299149275f555a147f3428b7592d14b;hpb=8b9693332912c44ab61efc7c3cb38d204682f7cc

diff --git a/FS/FS/part_pkg/prorate_Mixin.pm b/FS/FS/part_pkg/prorate_Mixin.pm
index 7d68be0bd..380f0b029 100644
--- a/FS/FS/part_pkg/prorate_Mixin.pm
+++ b/FS/FS/part_pkg/prorate_Mixin.pm
@@ -98,7 +98,11 @@ sub calc_prorate {
     my $months = ( ( $self->freq - 1 ) + ($mend-$mnow) / ($mend-$mstart) );
 
     # add a full period if currently billing for a partial period
-    if ( ( $self->option('add_full_period',1) 
+    # or periods up to freq_override if billing for an override interval
+    if ( ($param->{'freq_override'} || 0) > 1 ) {
+      $months += $param->{'freq_override'} - 1;
+    }
+    elsif ( ( $self->option('add_full_period',1) 
         or $self->option('prorate_defer_bill',1) ) # necessary
         and $months < $self->freq ) {
       $months += $self->freq;