summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcvs2git <cvs2git>2009-07-23 21:01:12 +0000
committercvs2git <cvs2git>2009-07-23 21:01:12 +0000
commit5499d757dd44fe6ae67ae2938fd1afe9856e0861 (patch)
tree6d68406ce77c6c59f3158fbf9b7d205e49d8f7d6
parentad75e632ebea828527847b8a457589780bb09a49 (diff)
parent2a5af7b36a04593f7503d1e2e13dcfacf63be601 (diff)
This commit was manufactured by cvs2svn to create tag 'freeside_1_7_4rc1'.freeside_1_7_4rc1
-rw-r--r--FS/FS/cust_pay.pm3
-rwxr-xr-xFS/bin/freeside-void-payments2
2 files changed, 2 insertions, 3 deletions
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 21a6068..08699ac 100644
--- 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
--- 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 );