This commit was manufactured by cvs2svn to create tag 'freeside_2_1_1'.

[freeside.git] / FS / FS / part_pkg / prorate_Mixin.pm

diff --git a/FS/FS/part_pkg/prorate_Mixin.pm b/FS/FS/part_pkg/prorate_Mixin.pm
index b77d898..2adf2f1 100644 (file)
--- a/FS/FS/part_pkg/prorate_Mixin.pm
+++ b/FS/FS/part_pkg/prorate_Mixin.pm
@@ -66,10 +66,6 @@ sub calc_prorate {
     # only works for freq >= 1 month; probably can't be fixed
     my $mnow = $$sdate;
     my ($sec, $min, $hour, $mday, $mon, $year) = (localtime($mnow))[0..5];
-    if ( $self->option('prorate_round_day',1) ) {
-      $mday++ if $hour >= 12;
-      $mnow = timelocal(0,0,0,$mday,$mon,$year);
-    }
     my $mend;
     my $mstart;
     if ( $mday >= $cutoff_day ) {
@@ -84,19 +80,12 @@ sub calc_prorate {
       $mstart = 
         timelocal(0,0,0,$cutoff_day,$mon == 0 ? 11 : $mon - 1,$year-($mon==11));
     }
-   
-    # next bill date will be figured as $$sdate + one period
+    
     $$sdate = $mstart;
 
     my $permonth = $self->option('recur_fee', 1) / $self->freq;
     my $months = ( ( $self->freq - 1 ) + ($mend-$mnow) / ($mend-$mstart) );
-
-    if ( $self->option('add_full_period',1) ) {
-      # charge a full period in addition to the partial month
-      $months += $self->freq;
-      $$sdate = $self->add_freq($mstart);
-    }
-
+    
     $param->{'months'} = $months;
     $charge = sprintf('%.2f', $permonth * $months);
   }