This commit was manufactured by cvs2svn to create tag 'freeside_1_7_4rc1'.

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 21a6068..08699ac 100644 (file)
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -339,8 +339,7 @@ sub delete {
     return $error;
   }
 
-  if (    $conf->exists('deletepayments')
-       && $conf->config('deletepayments') ne '' ) {
+  if ( $conf->config('deletepayments') ne '' ) {
 
     my $cust_main = $self->cust_main;
 

diff --git a/FS/bin/freeside-void-payments b/FS/bin/freeside-void-payments
index b6869a3..18fed05 100755 (executable)
--- a/FS/bin/freeside-void-payments
+++ b/FS/bin/freeside-void-payments
@@ -14,7 +14,7 @@ use Date::Parse 'str2time';
 use Date::Format 'time2str';
 
 my %opt;
-getopts("r:f:ca:g:s:e:", \%opt);
+getopts("f:ca:g:s:e:", \%opt);
 
 $user = shift or die &usage;
 &adminsuidsetup( $user );