@@ -, +, @@ --- C4/Members.pm | 8 ++++---- t/db_dependent/lib/KohaTest/Members.pm | 2 +- tools/cleanborrowers.pl | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) --- a/C4/Members.pm +++ a/C4/Members.pm @@ -88,7 +88,7 @@ BEGIN { GetBorrowerCategorycode &GetBorrowercategoryList - &GetBorrowersWhoHaveNotBorrowedSince + &GetBorrowersToExpunge &GetBorrowersWhoHaveNeverBorrowed &GetBorrowersWithIssuesHistoryOlderThan @@ -1922,9 +1922,9 @@ WHERE roadtypeid=?|; return ($roadtype); } -=head2 GetBorrowersWhoHaveNotBorrowedSince +=head2 GetBorrowersToExpunge - $borrowers = &GetBorrowersWhoHaveNotBorrowedSince( + $borrowers = &GetBorrowersToExpunge( not_borrowered_since => $not_borrowered_since, expired_before => $expired_before, category_code => $category_code, @@ -1935,7 +1935,7 @@ WHERE roadtypeid=?|; =cut -sub GetBorrowersWhoHaveNotBorrowedSince { +sub GetBorrowersToExpunge { my $params = shift; my $filterdate = $params->{'not_borrowered_since'}; --- a/t/db_dependent/lib/KohaTest/Members.pm +++ a/t/db_dependent/lib/KohaTest/Members.pm @@ -48,7 +48,7 @@ sub methods : Test( 1 ) { GetPatronImage PutPatronImage RmPatronImage - GetBorrowersWhoHaveNotBorrowedSince + GetBorrowersToExpunge GetBorrowersWhoHaveNeverBorrowed GetBorrowersWithIssuesHistoryOlderThan GetBorrowersNamesAndLatestIssue --- a/tools/cleanborrowers.pl +++ a/tools/cleanborrowers.pl @@ -78,7 +78,7 @@ if ( $params->{'step2'} ) { my $membersToDelete; if ( $checkboxes{borrower} ) { $membersToDelete = - GetBorrowersWhoHaveNotBorrowedSince( { not_borrowered_since => $filterdate1, expired_before => $borrower_dateexpiry, category_code => $borrower_categorycode } ); + GetBorrowersToExpunge( { not_borrowered_since => $filterdate1, expired_before => $borrower_dateexpiry, category_code => $borrower_categorycode } ); $totalDel = scalar @$membersToDelete; } @@ -120,7 +120,7 @@ if ( $params->{'step3'} ) { # delete members if ($do_delete) { my $membersToDelete = - GetBorrowersWhoHaveNotBorrowedSince( { not_borrowered_since => $filterdate1, expired_before => $borrower_dateexpiry, category_code => $borrower_categorycode } ); + GetBorrowersToExpunge( { not_borrowered_since => $filterdate1, expired_before => $borrower_dateexpiry, category_code => $borrower_categorycode } ); $totalDel = scalar(@$membersToDelete); $radio = $params->{'radio'}; if ( $radio eq 'trash' ) { --