X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2Fpart_pkg%2Frecur_Common.pm;h=07355f6888824aca2c996ad41eb6bd8233fb7477;hb=4321924ff5a68868a7ee622920fd4bbd53d6475f;hp=3573cf1a74485eba77d3bbe8b2c65f3f105ef5fe;hpb=23178237bcb103cb785829bf45cdd7a2710adabf;p=freeside.git

diff --git a/FS/FS/part_pkg/recur_Common.pm b/FS/FS/part_pkg/recur_Common.pm
index 3573cf1a7..07355f688 100644
--- a/FS/FS/part_pkg/recur_Common.pm
+++ b/FS/FS/part_pkg/recur_Common.pm
@@ -41,13 +41,14 @@ sub cutoff_day {
   # prorate/subscription only; we don't support sync_bill_date here
   my( $self, $cust_pkg ) = @_;
   my $recur_method = $self->option('recur_method',1) || 'anniversary';
-  return () unless $recur_method eq 'prorate'
-                || $recur_method eq 'subscription';
+  my $cust_main = $cust_pkg->cust_main;
 
-  #false laziness w/prorate.pm::cutoff_day
-  my $prorate_day = $cust_pkg->cust_main->prorate_day;
-  $prorate_day ? ( $prorate_day )
-               : split(/\s*,\s*/, $self->option('cutoff_day', 1) || '1');
+  if ( $cust_main->force_prorate_day and $cust_main->prorate_day ) {
+     return ( $cust_main->prorate_day );
+  } elsif ($recur_method eq 'prorate' || $recur_method eq 'subscription') {
+
+    return split(/\s*,\s*/, $self->option('cutoff_day', 1) || '1');
+  }
 }
 
 sub calc_recur_Common {