From aed8ec35ccb9cdeb7ea0cb6ff2946f9d83d582f6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 20 Dec 2011 23:50:50 +0000
Subject: [PATCH] fix 'Can't call method "setup" on an undefined value' error
 when using into rates together with term discounts, RT#15661

---
 FS/FS/discount_plan.pm         | 2 +-
 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' ) {
-- 
2.11.0