From: levinse <levinse>
Date: Wed, 9 Feb 2011 05:22:20 +0000 (+0000)
Subject: fix regression caused by RT10481 in sql_external, RT11536
X-Git-Tag: freeside_2_1_2~67
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=a067102c0d7c19e1206c7ad44ac067e55b1b3024

fix regression caused by RT10481 in sql_external, RT11536
---

diff --git a/FS/FS/part_pkg/recur_Common.pm b/FS/FS/part_pkg/recur_Common.pm
index 95ae0d077..05e1efb02 100644
--- a/FS/FS/part_pkg/recur_Common.pm
+++ b/FS/FS/part_pkg/recur_Common.pm
@@ -37,6 +37,7 @@ sub calc_recur_Common {
     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 @@ sub calc_recur_Common {
       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' ) {