[freeside-commits] freeside/FS/FS/part_pkg recur_Common.pm, 1.7.2.1, 1.7.2.2

[Erik Levinson]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	recur_Common.pm 
Log Message:
fix regression caused by RT10481 in sql_external, RT11536

Index: recur_Common.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/recur_Common.pm,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -w -d -r1.7.2.1 -r1.7.2.2
--- recur_Common.pm	18 Jan 2011 05:21:09 -0000	1.7.2.1
+++ recur_Common.pm	9 Feb 2011 05:22:20 -0000	1.7.2.2
@@ -37,6 +37,7 @@
     if ( $recur_method eq 'prorate' ) {
       my $cutoff_day = $self->option('cutoff_day') || 1;
       $charges = $self->calc_prorate(@_, $cutoff_day);
+      $charges += $param->{'override_charges'} if $param->{'override_charges'};
     }
     elsif ( $recur_method eq 'anniversary' and 
             $self->option('sync_bill_date',1) ) {
@@ -44,6 +45,7 @@
       if ( defined($next_bill) ) {
         my $cutoff_day = (localtime($next_bill))[3];
         $charges = $self->calc_prorate(@_, $cutoff_day);
+        $charges += $param->{'override_charges'} if $param->{'override_charges'};
       }
     } 
     elsif ( $recur_method eq 'subscription' ) {