diff options
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/discount_plan.pm | 2 | ||||
| -rw-r--r-- | FS/FS/part_pkg/recur_Common.pm | 2 | 
2 files changed, 2 insertions, 2 deletions
| diff --git a/FS/FS/discount_plan.pm b/FS/FS/discount_plan.pm index 4f97e3351..3ae44c8d4 100644 --- a/FS/FS/discount_plan.pm +++ b/FS/FS/discount_plan.pm @@ -63,7 +63,7 @@ sub new {      my $recur = $cust_bill_pkg->recur || 0;      if ( $freq eq '1' ) { # monthly recurring package -      my $permonth = $part_pkg->base_recur_permonth || 0; +      my $permonth = $part_pkg->base_recur_permonth($cust_pkg) || 0;        my ($discount) = grep { $_->months == $months }        map { $_->discount } $part_pkg->part_pkg_discount; diff --git a/FS/FS/part_pkg/recur_Common.pm b/FS/FS/part_pkg/recur_Common.pm index 7197eaeee..7233cc67f 100644 --- a/FS/FS/part_pkg/recur_Common.pm +++ b/FS/FS/part_pkg/recur_Common.pm @@ -60,7 +60,7 @@ sub calc_recur_Common {      my $recur_method = $self->option('recur_method', 1) || 'anniversary';      my $cutoff_day = $self->cutoff_day($cust_pkg); -    $charges = $self->base_recur; +    $charges = $self->base_recur($cust_pkg);      $charges += $param->{'override_charges'} if $param->{'override_charges'};      if ( $recur_method eq 'prorate' ) { | 
