From 674e385bf10903e6242bafe20a4af3d659111ee1 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 29 Mar 2022 01:00:27 +1300 Subject: [PATCH] Bug 30291: Changes to staff client files Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize Signed-off-by: Fridolin Somers --- catalogue/detail.pl | 2 +- circ/circulation.pl | 14 ++++---- circ/returns.pl | 12 +++---- .../prog/en/includes/recalls.inc | 36 +++++++++---------- .../prog/en/modules/circ/circulation.tt | 10 +++--- .../prog/en/modules/circ/returns.tt | 28 +++++++-------- .../en/modules/recalls/recalls_to_pull.tt | 6 ++-- .../en/modules/recalls/recalls_waiting.tt | 16 ++++----- members/recallshistory.pl | 2 +- misc/cronjobs/recalls/expire_recalls.pl | 8 ++--- recalls/recall_pickup_slip.pl | 12 +++---- recalls/recalls_old_queue.pl | 2 +- recalls/recalls_overdue.pl | 2 +- recalls/recalls_queue.pl | 2 +- recalls/recalls_to_pull.pl | 12 +++---- recalls/recalls_waiting.pl | 4 +-- recalls/request.pl | 4 +-- 17 files changed, 86 insertions(+), 86 deletions(-) diff --git a/catalogue/detail.pl b/catalogue/detail.pl index 612aa03874..9687f3b01b 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -408,7 +408,7 @@ foreach my $item (@items) { } if ( C4::Context->preference('UseRecalls') ) { - my $recall = Koha::Recalls->find({ itemnumber => $item->{itemnumber}, old => 0 }); + my $recall = Koha::Recalls->find({ item_id => $item->{itemnumber}, completed => 0 }); if ( defined $recall ) { $item->{recalled} = 1; $item->{recall} = $recall; diff --git a/circ/circulation.pl b/circ/circulation.pl index dfa5cb1fd7..6aaf831ba6 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -396,14 +396,14 @@ if (@$barcodes) { if ( C4::Context->preference('UseRecalls') && !$recall_id ) { my $recall = Koha::Recalls->find( { - biblionumber => $item->biblionumber, - itemnumber => [ undef, $item->itemnumber ], - status => [ 'requested', 'waiting' ], - old => 0, - borrowernumber => $patron->borrowernumber, + biblio_id => $item->biblionumber, + item_id => [ undef, $item->itemnumber ], + status => [ 'requested', 'waiting' ], + completed => 0, + patron_id => $patron->borrowernumber, } ); - $recall_id = ( $recall and $recall->recall_id ) ? $recall->recall_id : undef; + $recall_id = ( $recall and $recall->id ) ? $recall->id : undef; } my $issue = AddIssue( $patron->unblessed, $barcode, $datedue, $cancelreserve, undef, undef, { onsite_checkout => $onsite_checkout, auto_renew => $session->param('auto_renew'), switch_onsite_checkout => $switch_onsite_checkout, cancel_recall => $cancel_recall, recall_id => $recall_id, } ); $template_params->{issue} = $issue; @@ -455,7 +455,7 @@ if ($patron) { ); if ( C4::Context->preference('UseRecalls') ) { $template->param( - recalls => $patron->recalls->filter_by_current->search({},{ order_by => { -asc => 'recalldate' } }), + recalls => $patron->recalls->filter_by_current->search({},{ order_by => { -asc => 'created_date' } }), specific_patron => 1, ); } diff --git a/circ/returns.pl b/circ/returns.pl index 8a6f5fff2a..e2d2317a37 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -181,11 +181,11 @@ if ( $query->param('recall_id') ) { if ($recall) { my $item; - if ( !$recall->item_level_recall ) { + if ( !$recall->item_level ) { $item = Koha::Items->find( $itemnumber ); } - if ( $recall->branchcode ne $return_branch ) { + if ( $recall->pickup_library_id ne $return_branch ) { $recall->start_transfer({ item => $item }) if !$recall->in_transit; } else { my $expirationdate = $recall->calc_expirationdate; @@ -254,7 +254,7 @@ if ($transit) { if ( $canceltransfer ) { $transfer->cancel({ reason => 'Manual', force => 1}); if ( C4::Context->preference('UseRecalls') ) { - my $recall_transfer_deleted = Koha::Recalls->find({ itemnumber => $itemnumber, status => 'in_transit' }); + my $recall_transfer_deleted = Koha::Recalls->find({ item_id => $itemnumber, status => 'in_transit' }); if ( defined $recall_transfer_deleted ) { $recall_transfer_deleted->revert_transfer; } @@ -268,7 +268,7 @@ if ($transit) { my $transfer = $item->get_transfer; $transfer->cancel({ reason => 'Manual', force => 1}); if ( C4::Context->preference('UseRecalls') ) { - my $recall_transfer_deleted = Koha::Recalls->find({ itemnumber => $itemnumber, status => 'in_transit' }); + my $recall_transfer_deleted = Koha::Recalls->find({ item_id => $itemnumber, status => 'in_transit' }); if ( defined $recall_transfer_deleted ) { $recall_transfer_deleted->revert_transfer; } @@ -534,10 +534,10 @@ if ( $messages->{TransferredRecall} ) { my $recall = $messages->{TransferredRecall}; # confirm transfer has arrived at the branch - my $transfer = Koha::Item::Transfers->search({ datearrived => { '!=' => undef }, itemnumber => $recall->itemnumber }, { order_by => { -desc => 'datearrived' } })->next; + my $transfer = Koha::Item::Transfers->search({ datearrived => { '!=' => undef }, itemnumber => $recall->item_id }, { order_by => { -desc => 'datearrived' } })->next; # if transfer has completed, show popup to confirm as waiting - if ( defined $transfer and $transfer->tobranch eq $recall->branchcode ) { + if ( defined $transfer and $transfer->tobranch eq $recall->pickup_library_id ) { $template->param( found => 1, recall => $recall, diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc index 75f42859ee..0c007f0285 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc @@ -18,20 +18,20 @@ [% FOREACH recall IN recalls %] - [% IF recall.old %][% ELSE %][% END %] + [% IF recall.completed %][% ELSE %][% END %] [% IF checkboxes %] - [% IF recall.old %] + [% IF recall.completed %]   [% ELSE %] - + [% END %] [% END %] - + [% recall.biblio.title | html %] [% FOREACH s IN recall.biblio.subtitle %] [% s | html %] @@ -48,13 +48,13 @@ [% END %] - [% recall.recalldate | $KohaDates %] + [% recall.created_date | $KohaDates %] - [% IF ( recall.expirationdate ) %] - [% recall.expirationdate | $KohaDates %] - [% ELSIF ( !recall.old ) %] + [% IF ( recall.expiration_date ) %] + [% recall.expiration_date | $KohaDates %] + [% ELSIF ( !recall.completed ) %] Never expires [% ELSE %] - @@ -71,9 +71,9 @@ [% ELSIF ( recall.waiting ) %] Ready for pickup [% ELSIF ( recall.expired ) %] - Expired on [% recall.expirationdate | $KohaDates %] + Expired on [% recall.expiration_date | $KohaDates %] [% ELSIF ( recall.cancelled ) %] - Cancelled on [% recall.cancellationdate | $KohaDates %] + Cancelled on [% recall.completed_date | $KohaDates %] [% ELSIF ( recall.overdue ) %] Overdue to be returned [% ELSIF ( recall.fulfilled ) %] @@ -87,8 +87,8 @@ [% IF recall.requested and recall.checkout %] Due to be returned by [% recall.checkout.date_due | $KohaDates %] - [% ELSIF recall.waiting and RECALL.expirationdate %] - Pick up by [% RECALL.expirationdate | $KohaDates %] + [% ELSIF recall.waiting and RECALL.expiration_date %] + Pick up by [% RECALL.expiration_date | $KohaDates %] [% ELSE %] - [% END %] @@ -97,22 +97,22 @@ [% UNLESS viewing_old %] - [% IF recall.old %] + [% IF recall.completed %]   [% ELSE %]
Actions
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 5a35cc181e..6b5ef7c81d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -238,9 +238,9 @@ [% IF RECALLED %] [% IF RECALLED.waiting %] -
  • Item [% RECALLED.biblio.title | html %] ([% RECALLED.item.barcode | html %]) has been waiting for [% RECALLED.patron.firstname | html %] [% RECALLED.patron.surname | html %] ([% RECALLED.patron.cardnumber | html %]) at [% Branches.GetName( RECALLED.branchcode ) | html %] since [% RECALLED.waitingdate | $KohaDates %]
    • +
  • Item [% RECALLED.biblio.title | html %] ([% RECALLED.item.barcode | html %]) has been waiting for [% RECALLED.patron.firstname | html %] [% RECALLED.patron.surname | html %] ([% RECALLED.patron.cardnumber | html %]) at [% Branches.GetName( RECALLED.pickup_library_id ) | html %] since [% RECALLED.waiting_date | $KohaDates %]
    • [% ELSIF RECALLED.requested or RECALLED.overdue %] -
  • Item [% RECALLED.biblio.title | html %] [% IF RECALLED.item %]([% RECALLED.item.barcode | html %])[% END %] has been recalled by [% RECALLED.patron.firstname | html %] [% RECALLED.patron.surname | html %] ([% RECALLED.patron.cardnumber | html %]) at [% Branches.GetName( RECALLED.branchcode ) | html %] since [% RECALLED.recalldate | $KohaDates %]
    • +
  • Item [% RECALLED.biblio.title | html %] [% IF RECALLED.item %]([% RECALLED.item.barcode | html %])[% END %] has been recalled by [% RECALLED.patron.firstname | html %] [% RECALLED.patron.surname | html %] ([% RECALLED.patron.cardnumber | html %]) at [% Branches.GetName( RECALLED.pickup_library_id ) | html %] since [% RECALLED.created_date | $KohaDates %]
    • [% END %] [% END %] @@ -297,13 +297,13 @@

    - +

    [% IF RECALLED.waiting %]

    - +

    [% END %] [% END %] @@ -350,7 +350,7 @@ [% IF ( RECALLED ) %]
    - +
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 6829eb8315..afba66427f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -749,19 +749,19 @@

    Recall found:
    - [% recall.biblio.title | html %] + [% recall.biblio.title | html %] [% IF recall.item %]
    - ([% recall.item.barcode | html %]) + ([% recall.item.barcode | html %])
    [% END %]

    - [% IF ( recall.recallnotes ) %] + [% IF ( recall.notes ) %]

    Notes:

    -

    [% recall.recallnotes | html %]

    +

    [% recall.notes | html %]

    [% END %]
    Recall placed by:
    @@ -800,12 +800,12 @@ [% END %] [% IF ( transfertodo ) %] -

    Transfer to: [% Branches.GetName( recall.branchcode ) | html %]

    +

    Transfer to: [% Branches.GetName( recall.pickup_library_id ) | html %]

    [% ELSE %] -

    Recall at [% Branches.GetName( recall.branchcode ) | html %]

    +

    Recall at [% Branches.GetName( recall.pickup_library_id ) | html %]

    [% END %] - + @@ -850,19 +850,19 @@

    Recall found (item is already waiting):
    - [% recall.biblio.title | html %] + [% recall.biblio.title | html %] [% IF recall.item %]
    - ([% recall.item.barcode | html %]) + ([% recall.item.barcode | html %])
    [% END %]

    - [% IF ( recall.recallnotes ) %] + [% IF ( recall.notes ) %]

    Notes:

    -

    [% recall.recallnotes | html %]

    +

    [% recall.notes | html %]

    [% END %]
    Recall placed by:
    @@ -901,12 +901,12 @@ [% END %] [% IF ( transfertodo ) %] -

    Transfer to: [% Branches.GetName( recall.branchcode ) | html %]

    +

    Transfer to: [% Branches.GetName( recall.pickup_library_id ) | html %]

    [% ELSE %] -

    Wait for pickup at [% Branches.GetName( recall.branchcode ) | html %]

    +

    Wait for pickup at [% Branches.GetName( recall.pickup_library_id ) | html %]

    [% END %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt index 70e8f009f7..0a1dd5f5a3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt @@ -59,7 +59,7 @@ [% recall.pull_count | html %] [% recall.items_count | html %] [% recall.patrons_count | html %] - [% recall.first_recall.patron.firstname | html %] [% recall.first_recall.patron.surname | html %] + [% recall.first_recall.patron.firstname | html %] [% recall.first_recall.patron.surname | html %] [% INCLUDE 'biblio-title.inc' biblio=recall.first_recall.biblio link=1 %] [% IF recall.first_recall.biblio.author %] by [% recall.first_recall.biblio.author | html %][% END %] @@ -107,11 +107,11 @@ - [% recall.first_recall.recalldate | $KohaDates %] in [% recall.first_recall.library.branchname | html %] + [% recall.first_recall.created_date | $KohaDates %] in [% recall.first_recall.library.branchname | html %]
    - + [% IF recall.first_recall.in_transit %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt index a7ab7f424e..fafd1e1daa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt @@ -48,9 +48,9 @@ [% FOREACH recall IN recalls %] - [% recall.waitingdate | $KohaDates %] + [% recall.waiting_date | $KohaDates %] - + [% recall.biblio.title | html %] [% FOREACH s IN recall.biblio.subtitle %] [% s | html %] @@ -60,14 +60,14 @@
    Barcode: [% recall.item.barcode | html %] -     [% recall.patron.firstname | html %] [% recall.patron.surname | html %] + [% recall.patron.firstname | html %] [% recall.patron.surname | html %] [% IF ( recall.patron.phone ) %]
    [% recall.patron.phone | html %][% END %] [% IF ( recall.patron.email ) %]
    [% recall.patron.email | html %][% END %] [% recall.library.branchname | html %] - +
    @@ -96,9 +96,9 @@ [% FOREACH recall IN over %] - [% recall.waitingdate | $KohaDates %] + [% recall.waiting_date | $KohaDates %] - + [% recall.biblio.title | html %] [% FOREACH s IN recall.biblio.subtitles %] [% s | html %] @@ -109,14 +109,14 @@
    Barcode: [% recall.item.barcode | html %] -     [% recall.patron.firstname | html %] [% recall.patron.surname | html %] + [% recall.patron.firstname | html %] [% recall.patron.surname | html %] [% IF ( recall.patron.phone ) %]
    [% recall.patron.phone | html %][% END %] [% IF ( recall.patron.email ) %]
    [% recall.patron.email | html %][% END %] [% recall.library.branchname | html %] - +
    diff --git a/members/recallshistory.pl b/members/recallshistory.pl index 851d0005d6..7b4bc4b7a2 100755 --- a/members/recallshistory.pl +++ b/members/recallshistory.pl @@ -33,7 +33,7 @@ my ($template, $loggedinuser, $cookie)= get_template_and_user( ); my $borrowernumber = $input->param('borrowernumber'); -my $recalls = Koha::Recalls->search({ borrowernumber => $borrowernumber }, { order_by => { '-desc' => 'recalldate' } }); +my $recalls = Koha::Recalls->search({ patron_id => $borrowernumber }, { order_by => { '-desc' => 'created_date' } }); my $patron = Koha::Patrons->find( $borrowernumber ); $template->param( diff --git a/misc/cronjobs/recalls/expire_recalls.pl b/misc/cronjobs/recalls/expire_recalls.pl index 2f6b4d2bf6..7a4a6deebf 100755 --- a/misc/cronjobs/recalls/expire_recalls.pl +++ b/misc/cronjobs/recalls/expire_recalls.pl @@ -37,9 +37,9 @@ use C4::Log; cronlogaction(); -my $recalls = Koha::Recalls->search({ old => 0 }); +my $recalls = Koha::Recalls->search({ completed => 0 }); while( my $recall = $recalls->next ) { - if ( ( $recall->requested or $recall->overdue ) and $recall->expirationdate and dt_from_string( $recall->expirationdate ) < dt_from_string() ){ + if ( ( $recall->requested or $recall->overdue ) and $recall->expiration_date and dt_from_string( $recall->expiration_date ) < dt_from_string() ){ # recall is requested or overdue and has surpassed the specified expiration date $recall->set_expired({ interface => 'COMMANDLINE' }); } @@ -47,10 +47,10 @@ while( my $recall = $recalls->next ) { my $recall_shelf_time = Koha::CirculationRules->get_effective_rule({ categorycode => $recall->patron->categorycode, itemtype => $recall->item->effective_itemtype, - branchcode => $recall->branchcode, + branchcode => $recall->pickup_library_id, rule_name => 'recall_shelf_time', }); - my $waitingdate = dt_from_string( $recall->waitingdate ); + my $waitingdate = dt_from_string( $recall->waiting_date ); my $now = dt_from_string(); my $days_waiting = $now->subtract_datetime( $waitingdate ); if ( defined $recall_shelf_time and $recall_shelf_time->rule_value > 0 ) { diff --git a/recalls/recall_pickup_slip.pl b/recalls/recall_pickup_slip.pl index 7f4042e5d4..20816db517 100755 --- a/recalls/recall_pickup_slip.pl +++ b/recalls/recall_pickup_slip.pl @@ -38,8 +38,8 @@ my $recallid = $input->param('recall_id'); my $recall = Koha::Recalls->find($recallid); my $itemnumber; -if ( $recall->itemnumber ){ - $itemnumber = $recall->itemnumber; +if ( $recall->item_id ){ + $itemnumber = $recall->item_id; } else { $itemnumber = $recall->checkout->itemnumber; } @@ -50,11 +50,11 @@ my $letter = C4::Letters::GetPreparedLetter( letter_code => 'RECALL_REQUESTER_DET', message_transport_type => 'print', tables => { - 'branches' => $recall->branchcode, - 'borrowers' => $recall->borrowernumber, - 'biblio' => $recall->biblionumber, + 'branches' => $recall->pickup_library_id, + 'borrowers' => $recall->patron_id, + 'biblio' => $recall->biblio_id, 'items' => $itemnumber, - 'recalls' => $recall->recall_id, + 'recalls' => $recall->id, } ); diff --git a/recalls/recalls_old_queue.pl b/recalls/recalls_old_queue.pl index 64370aa132..f2b6cb311a 100755 --- a/recalls/recalls_old_queue.pl +++ b/recalls/recalls_old_queue.pl @@ -33,7 +33,7 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( } ); -my $recalls = Koha::Recalls->search({ old => 1 }); +my $recalls = Koha::Recalls->search({ completed => 1 }); $template->param( recalls => $recalls, viewing_old => 1 diff --git a/recalls/recalls_overdue.pl b/recalls/recalls_overdue.pl index c0454d1900..f6db6cfa43 100755 --- a/recalls/recalls_overdue.pl +++ b/recalls/recalls_overdue.pl @@ -45,7 +45,7 @@ if ( $op eq 'cancel_multiple_recalls' ) { } if ( $op eq 'list' ) { - my $recalls = Koha::Recalls->search({ status => 'O' }); + my $recalls = Koha::Recalls->search({ status => 'overdue' }); # will be set as Overdue by the misc/cronjobs/recall/overdue_recalls.pl cronjob $template->param( recalls => $recalls, diff --git a/recalls/recalls_queue.pl b/recalls/recalls_queue.pl index 9479adaf46..51a56b7168 100755 --- a/recalls/recalls_queue.pl +++ b/recalls/recalls_queue.pl @@ -42,7 +42,7 @@ if ( $op eq 'cancel_multiple_recalls' ) { $op = 'list' } elsif ( $op eq 'list' ) { - my $recalls = Koha::Recalls->search({ old => 0 }); + my $recalls = Koha::Recalls->search({ completed => 0 }); $template->param( recalls => $recalls, checkboxes => 1, diff --git a/recalls/recalls_to_pull.pl b/recalls/recalls_to_pull.pl index 73d1d294f5..40d7318067 100755 --- a/recalls/recalls_to_pull.pl +++ b/recalls/recalls_to_pull.pl @@ -45,21 +45,21 @@ if ( $op eq 'cancel' ) { } if ( $op eq 'list' ) { - my @recalls = Koha::Recalls->search({ status => [ 'R','O','T' ] })->as_list; + my @recalls = Koha::Recalls->search({ status => [ 'requested','overdue','in_transit' ] })->as_list; my @pull_list; my %seen_bib; foreach my $recall ( @recalls ) { - if ( $seen_bib{$recall->biblionumber} ){ + if ( $seen_bib{$recall->biblio_id} ){ # we've already looked at the recalls on this biblio next; } else { # this is an unseen biblio - $seen_bib{$recall->biblionumber}++; + $seen_bib{$recall->biblio_id}++; # get recall data about this biblio - my @this_bib_recalls = Koha::Recalls->search({ biblionumber => $recall->biblionumber, status => [ 'R','O','T' ] }, { order_by => { -asc => 'recalldate' } })->as_list; + my @this_bib_recalls = Koha::Recalls->search({ biblio_id => $recall->biblio_id, status => [ 'requested','overdue','in_transit' ] }, { order_by => { -asc => 'created_date' } })->as_list; my $recalls_count = scalar @this_bib_recalls; - my @unique_patrons = do { my %seen; grep { !$seen{$_->borrowernumber}++ } @this_bib_recalls }; + my @unique_patrons = do { my %seen; grep { !$seen{$_->patron_id}++ } @this_bib_recalls }; my $patrons_count = scalar @unique_patrons; my $first_recall = $this_bib_recalls[0]; @@ -71,7 +71,7 @@ if ( $op eq 'list' ) { my @locations; my @libraries; - my @items = Koha::Items->search({ biblionumber => $recall->biblionumber }); + my @items = Koha::Items->search({ biblio_id => $recall->biblio_id }); foreach my $item ( @items ) { if ( $item->can_be_waiting_recall and !$item->checkout ) { # if item can be pulled to fulfill recall, collect item data diff --git a/recalls/recalls_waiting.pl b/recalls/recalls_waiting.pl index 9581117293..4ded9584e8 100755 --- a/recalls/recalls_waiting.pl +++ b/recalls/recalls_waiting.pl @@ -51,13 +51,13 @@ if ( $op eq 'modify' ) { } if ( $op eq 'list' ) { - my @recalls = Koha::Recalls->search({ status => 'W' })->as_list; + my @recalls = Koha::Recalls->search({ status => 'waiting' })->as_list; my $borrower = Koha::Patrons->find( $loggedinuser ); my @over; my $maxdelay = C4::Context->preference('RecallsMaxPickUpDelay') || 7; my $today = dt_from_string(); foreach my $r ( @recalls ){ - my $lastwaitingday = dt_from_string( $r->waitingdate )->add( days => $maxdelay ); + my $lastwaitingday = dt_from_string( $r->waiting_date )->add( days => $maxdelay ); if ( $today > $lastwaitingday ){ push @over, $r; } diff --git a/recalls/request.pl b/recalls/request.pl index da8ae1e88c..222f7ab38b 100755 --- a/recalls/request.pl +++ b/recalls/request.pl @@ -38,7 +38,7 @@ my ($template, $loggedinuser, $cookie)= get_template_and_user( my $op = $input->param('op') || 'list'; my @recall_ids = $input->multi_param('recall_ids'); my $biblionumber = $input->param('biblionumber'); -my $recalls = Koha::Recalls->search({ biblionumber => $biblionumber, old => 0 }); +my $recalls = Koha::Recalls->search({ biblio_id => $biblionumber, completed => 0 }); my $biblio = Koha::Biblios->find( $biblionumber ); if ( $op eq 'cancel_multiple_recalls' ) { @@ -49,7 +49,7 @@ if ( $op eq 'cancel_multiple_recalls' ) { } if ( $op eq 'list' ) { - $recalls = Koha::Recalls->search({ biblionumber => $biblionumber, old => 0 }); + $recalls = Koha::Recalls->search({ biblio_id => $biblionumber, completed => 0 }); $biblio = Koha::Biblios->find( $biblionumber ); } -- 2.39.5