@@ -, +, @@ --- 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(-) --- a/catalogue/detail.pl +++ a/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; --- a/circ/circulation.pl +++ a/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, ); } --- a/circ/returns.pl +++ a/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, --- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc @@ -18,20 +18,20 @@
[% FOREACH recall IN recalls %] - [% IF recall.old %]- +
[% IF RECALLED.waiting %]- +
[% END %] [% END %] @@ -350,7 +350,7 @@ [% IF ( RECALLED ) %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -749,19 +749,19 @@[% recall.recallnotes | html %]
+[% recall.notes | html %]
[% recall.recallnotes | html %]
+[% recall.notes | html %]