RT# 24643 - fixed error in saving waive setup fee flag when not selected

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index c95d31b..b2cc874 100644 (file)
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2363,7 +2363,8 @@ sub change {
     $same_pkgpart = 0;
   }
 
-  $self->set('waive_setup', $opt->{'waive_setup'}) if $opt->{'waive_setup'};
+  if ($opt->{'waive_setup'}) { $self->set('waive_setup', $opt->{'waive_setup'}) }
+  else { $self->set('waive_setup', ''); }
 
   # Before going any further here: if the package is still in the pre-setup
   # state, it's safe to modify it in place. No need to charge/credit for 

diff --git a/httemplate/edit/process/change-cust_pkg.html b/httemplate/edit/process/change-cust_pkg.html
index 3d50a13..0e87ad8 100644 (file)
--- a/httemplate/edit/process/change-cust_pkg.html
+++ b/httemplate/edit/process/change-cust_pkg.html
@@ -40,6 +40,8 @@ if ( $cgi->param('locationnum') == -1 ) {
   $change{'cust_location'} = $cust_location;
 }
 
+$change{waive_setup} = '';
+
 if ( $cgi->param('setup_discountnum') =~ /^(-?\d+)$/ ) { 
   if ( $1 == -2 ) {
     $change{waive_setup} = 'Y';