summaryrefslogtreecommitdiff
path: root/FS/FS
diff options
context:
space:
mode:
authorivan <ivan>2011-12-20 23:50:19 +0000
committerivan <ivan>2011-12-20 23:50:19 +0000
commit0aa75d8f76fd378816c1761307c39a68dd689974 (patch)
treeb28c7f69f495ecd1052ec400ff7bb870d562e914 /FS/FS
parent3dbb7d158b87c6bab8467e8f1fae8be5c59d0153 (diff)
fix 'Can't call method "setup" on an undefined value' error when using into rates together with term discounts, RT#15661
Diffstat (limited to 'FS/FS')
-rw-r--r--FS/FS/discount_plan.pm2
-rw-r--r--FS/FS/part_pkg/recur_Common.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/FS/FS/discount_plan.pm b/FS/FS/discount_plan.pm
index 4f97e33..3ae44c8 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 7197eae..7233cc6 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' ) {