1 files changed, 11 insertions, 41 deletions

diff --git a/FS/FS/cust_pay_void.pm b/FS/FS/cust_pay_void.pm
index 3a30acb..9293ef6 100644
--- a/FS/FS/cust_pay_void.pm
+++ b/FS/FS/cust_pay_void.pm
@@ -1,14 +1,12 @@
 package FS::cust_pay_void; 
 
 use strict;
-use base qw( FS::otaker_Mixin FS::payinfo_Mixin FS::cust_main_Mixin
-             FS::Record );
+use base qw( FS::otaker_Mixin FS::payinfo_Mixin FS::Record );
 use vars qw( @encrypted_fields $otaker_upgrade_kludge );
 use Business::CreditCard;
 use FS::UID qw(getotaker);
-use FS::Record qw(qsearch qsearchs dbh fields);
+use FS::Record qw(qsearchs dbh fields); # qsearch );
 use FS::CurrentUser;
-use FS::access_user;
 use FS::cust_pay;
 #use FS::cust_bill;
 #use FS::cust_bill_pay;
@@ -157,13 +155,16 @@ sub unvoid {
 Deletes this voided payment.  You probably don't want to use this directly; see
 the B<unvoid> method to add the original payment back.
 
-=item replace [ OLD_RECORD ]
+=item replace OLD_RECORD
 
-You can, but probably shouldn't modify voided payments...
+Currently unimplemented.
 
-Replaces the OLD_RECORD with this one in the database, or, if OLD_RECORD is not
-supplied, replaces this record.  If there is an error, returns the error,
-otherwise returns false.
+=cut
+
+sub replace {
+   return "Can't modify voided payments!" unless $otaker_upgrade_kludge;
+   shift->SUPER::replace(@_);
+}
 
 =item check
 
@@ -221,8 +222,7 @@ sub check {
     return $error if $error;
   }
 
-  $self->void_usernum($FS::CurrentUser::CurrentUser->usernum)
-    unless $self->void_usernum;
+  $self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;
 
   $self->SUPER::check;
 }
@@ -238,41 +238,11 @@ sub cust_main {
   qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
 }
 
-=item void_access_user
-
-Returns the voiding employee object (see L<FS::access_user>).
-
-=cut
-
-sub void_access_user {
-  my $self = shift;
-  qsearchs('access_user', { 'usernum' => $self->void_usernum } );
-}
-
 # Used by FS::Upgrade to migrate to a new database.
 sub _upgrade_data {  # class method
   my ($class, %opts) = @_;
-
-  my $sql = "SELECT usernum FROM access_user WHERE username = ( SELECT history_user FROM h_cust_pay_void WHERE paynum = ? AND history_action = 'insert' ORDER BY history_date LIMIT 1 ) ";
-  my $sth = dbh->prepare($sql) or die dbh->errstr;
-
-  foreach my $cust_pay_void (qsearch('cust_pay_void', {'void_usernum' => ''})) {
-    $sth->execute($cust_pay_void->paynum) or die $sth->errstr;
-    my $usernum = $sth->fetchrow_arrayref->[0] or next;
-    if ( $usernum ) {
-      $cust_pay_void->void_usernum($usernum);
-      my $error = $cust_pay_void->replace;
-      die $error if $error;
-    } else {
-      warn "cust_pay_void upgrade: can't find access_user record for ". $cust_pay_void->paynum. "\n";
-    }
-  }
-
   local($otaker_upgrade_kludge) = 1;
   $class->_upgrade_otaker(%opts);
-
-  #XXX look for the h_cust_pay delete records and when that's a different
-  # usernum, set usernum
 }
 
 =back