X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fflat.pm;h=7b5a3f6bbabf3e3386882d7c02173b2b03a2e465;hp=04d761b16ca5b348bc6c08610da64e7cd6276778;hb=747fc5e700ae36409be707b202c574a9b15d4c70;hpb=dc213442f13860d5f44ff7ea0df4eeaf1881d64f

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index 04d761b16..7b5a3f6bb 100644
--- 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 {