diff options
| author | levinse <levinse> | 2011-02-09 05:22:50 +0000 |
|---|---|---|
| committer | levinse <levinse> | 2011-02-09 05:22:50 +0000 |
| commit | 1833cbb8c9a99ac9e650dda0a51bba492ad25c04 (patch) | |
| tree | 41dc9e052cda2f913f4b2219977a9715668e533e | |
| parent | 84cb76fc346c721d87fa42515cd0780a01c0a686 (diff) | |
fix regression caused by RT10481 in sql_external, RT11536
| -rw-r--r-- | FS/FS/part_pkg/recur_Common.pm | 2 |
1 files changed, 2 insertions, 0 deletions
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' ) { |