[freeside-commits] freeside/FS/FS/part_pkg flat.pm, 1.13.2.15, 1.13.2.16 flat_delayed.pm, 1.5.2.1, 1.5.2.2 prorate_delayed.pm, 1.1.2.2, 1.1.2.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/part_pkg
In directory wavetail.420.am:/tmp/cvs-serv25477/FS/FS/part_pkg

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	flat.pm flat_delayed.pm prorate_delayed.pm 
Log Message:
fix cancellation errors with updated flat_introrate, RT#5865

Index: flat_delayed.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/flat_delayed.pm,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- flat_delayed.pm	21 Dec 2007 22:27:14 -0000	1.5.2.1
+++ flat_delayed.pm	5 Aug 2009 23:34:38 -0000	1.5.2.2
@@ -57,7 +57,7 @@
   return 0 if    $last_bill + (86400 * $free_days) == $next_bill
               && $last_bill == $cust_pkg->setup;
 
-  return 0 if    ! $self->base_recur
+  return 0 if    ! $self->base_recur($cust_pkg)
               || ! $self->option('unused_credit', 1)
               || ! $last_bill
               || ! $next_bill;

Index: flat.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/flat.pm,v
retrieving revision 1.13.2.15
retrieving revision 1.13.2.16
diff -u -d -r1.13.2.15 -r1.13.2.16
--- flat.pm	2 Jul 2009 01:30:08 -0000	1.13.2.15
+++ flat.pm	5 Aug 2009 23:34:37 -0000	1.13.2.16
@@ -176,7 +176,7 @@
   #my $last_bill = $cust_pkg->last_bill || 0;
   my $last_bill = $cust_pkg->get('last_bill') || 0; #->last_bill falls back to setup
 
-  return 0 if    ! $self->base_recur
+  return 0 if    ! $self->base_recur($cust_pkg)
               || ! $self->option('unused_credit', 1)
               || ! $last_bill
               || ! $next_bill
@@ -194,7 +194,7 @@
   my $freq_sec = $1 * $sec{$2||'m'};
   return 0 unless $freq_sec;
 
-  sprintf("%.2f", $self->base_recur * ( $next_bill - $time ) / $freq_sec );
+  sprintf("%.2f", $self->base_recur($cust_pkg) * ( $next_bill - $time ) / $freq_sec );
 
 }
 
@@ -216,7 +216,7 @@
 sub reset_usage {
   my($self, $cust_pkg, %opt) = @_;
   warn "    resetting usage counters" if $opt{debug} > 1;
-  my %values = $self->usage_valuehash; 
+  my %values = $self->usage_valuehash;
   if ($self->option('usage_rollover', 1)) {
     $cust_pkg->recharge(\%values);
   }else{

Index: prorate_delayed.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/prorate_delayed.pm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- prorate_delayed.pm	21 Dec 2007 22:27:14 -0000	1.1.2.2
+++ prorate_delayed.pm	5 Aug 2009 23:34:38 -0000	1.1.2.3
@@ -50,7 +50,7 @@
   return 0 if    $last_bill + (86400 * $free_days) == $next_bill
               && $last_bill == $cust_pkg->setup;
 
-  return 0 if    ! $self->base_recur
+  return 0 if    ! $self->base_recur($cust_pkg)
               || ! $self->option('unused_credit', 1)
               || ! $last_bill
               || ! $next_bill;