fixed the errors pointed out by Ivan in the following email:

----
before and after now?  I gave subscription and prorate a try.
Subscription came out as:

  subscription 27th (03/25/06 - 04/27/06)  $10.00
  subscription 23rd (03/25/06 - 04/23/06)  $10.00

the "23rd" one is right, but the "27th" one should have only advanced
the date two days to 3/27/06.

    Prorate came out as:

    prorate 23rd (03/25/06 - 04/23/06)  $9.20
    prorate 27th (03/25/06 - 04/27/06)  $10.49

The "23rd" one is right, but the "27th" one should have only advanced
the date two days to 4/27/06.


lsc@prgmr.com

2 files changed, 23 insertions, 9 deletions

diff --git a/FS/FS/part_pkg/prorate.pm b/FS/FS/part_pkg/prorate.pm
index d9464eef9..ac2f656b9 100644
--- a/FS/FS/part_pkg/prorate.pm
+++ b/FS/FS/part_pkg/prorate.pm
@@ -35,12 +35,23 @@ use FS::part_pkg::flat;
 
 sub calc_recur {
   my($self, $cust_pkg, $sdate ) = @_;
+  my $cutoff_day=$self->option('cutoff_day') or 1;
   my $mnow = $$sdate;
   my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
-  my $mstart = timelocal(0,0,0,$self->option('cutoff_day'),$mon,$year);
-  my $mend = timelocal(0,0,0,$self->option('cutoff_day'), $mon == 11 ? 0 : $mon+1, $year+($mon==11));
-  $$sdate = $mstart;
-
+  my $mend;
+  my $mstart;
+  if($mday > $cutoff_day){
+    $mend = timelocal(0,0,0,$cutoff_day, $mon == 11 ? 0 : $mon+1, $year+($mon==11));
+    $mstart=  timelocal(0,0,0,$cutoff_day,$mon,$year);  
+
+  }
+  else{
+    $mend = timelocal(0,0,0,$cutoff_day, $mon, $year);
+     if ($mon==0) {$mon=11;$year--;} else {$mon--;}
+    $mstart=  timelocal(0,0,0,$cutoff_day,$mon,$year);  
+  }
+
+   $$sdate = $mstart;
   my $permonth = $self->option('recur_fee') / $self->freq;
 
   $permonth * ( ( $self->freq - 1 ) + ($mend-$mnow) / ($mend-$mstart) );
diff --git a/FS/FS/part_pkg/subscription.pm b/FS/FS/part_pkg/subscription.pm
index 8ea791154..ccfcc00a8 100644
--- a/FS/FS/part_pkg/subscription.pm
+++ b/FS/FS/part_pkg/subscription.pm
@@ -9,7 +9,7 @@ use FS::part_pkg::flat;
 @ISA = qw(FS::part_pkg::flat);
 
 %info = (
-  'name' => 'First partial month full charge, then flat-rate (selectable month billing)',
+  'name' => 'First partial month full charge, then flat-rate (selectable billing day)',
   'fields' => {
     'setup_fee' => { 'name' => 'Setup fee for this package',
                      'default' => 0,
@@ -23,18 +23,21 @@ use FS::part_pkg::flat;
 
   },
   'fieldorder' => [ 'setup_fee', 'recur_fee','cutoff_day'],
-  #'setup' => 'what.setup_fee.value',
-  #'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; $sdate = timelocal(0,0,0,$self->option('cutoff_day'),$mon,$year); \' + what.recur_fee.value',
   'freq' => 'm',
   'weight' => 30,
 );
 
 sub calc_recur {
   my($self, $cust_pkg, $sdate ) = @_;
-
+  my $cutoff_day=$self->option('cutoff_day') or 1;
   my $mnow = $$sdate;
   my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
-  $$sdate = timelocal(0,0,0,$self->option('cutoff_day'),$mon,$year);
+
+  if($mday <$cutoff_day){
+     if ($mon==0) {$mon=11;$year--;}
+     else {$mon--;}
+  }
+$$sdate = timelocal(0,0,0,$cutoff_day,$mon,$year);
 
   $self->option('recur_fee');
 }