Merge branch 'bug_10230' into 3.14-master

[koha.git] / tools / cleanborrowers.pl

diff --git a/tools/cleanborrowers.pl b/tools/cleanborrowers.pl
index 6a30326..0d48b99 100755 (executable)
--- a/tools/cleanborrowers.pl
+++ b/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' ) {
@@ -145,7 +145,8 @@ if ( $params->{'step3'} ) {
 
     # Anonymising all members
     if ($do_anonym) {
-        $totalAno = AnonymiseIssueHistory($filterdate2);
+        #FIXME: anonymisation errors are not handled
+        ($totalAno,my $anonymisation_error) = AnonymiseIssueHistory($filterdate2);
         $template->param(
             filterdate1 => $filterdate2,
             do_anonym   => '1',
@@ -166,7 +167,6 @@ $template->param(
     step1                    => '1',
     filterdate1              => $filterdate1,
     filterdate2              => $filterdate2,
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
     borrower_categorycodes   => GetBorrowercategoryList(),
 );