optimize customer list (fix option caching in 3.x), RT#20173

[freeside.git] / FS / FS / part_pkg / flat.pm

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index 04d761b..7b5a3f6 100644 (file)
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -136,11 +136,7 @@ sub calc_setup {
 
 sub base_setup {
   my($self, $cust_pkg, $sdate, $details ) = @_;
-  ( exists( $self->{'Hash'}{'_opt_setup_fee'} )
-      ? $self->{'Hash'}{'_opt_setup_fee'}
-      : $self->option('setup_fee', 1) 
-  )
-    || 0;
+  $self->option('setup_fee', 1) || 0;
 }
 
 sub calc_recur {
@@ -193,11 +189,7 @@ sub cutoff_day {
 
 sub base_recur {
   my($self, $cust_pkg, $sdate) = @_;
-  ( exists( $self->{'Hash'}{'_opt_recur_fee'} )
-      ? $self->{'Hash'}{'_opt_recur_fee'}
-      : $self->option('recur_fee', 1) 
-  )
-    || 0;
+  $self->option('recur_fee', 1) || 0;
 }
 
 sub base_recur_permonth {