@@ -, +, @@ --- .../bootstrap/en/includes/item-status.inc | 2 +- opac/opac-detail.pl | 17 ++--------------- 2 files changed, 3 insertions(+), 16 deletions(-) --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc +++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc @@ -103,7 +103,7 @@ [% END %] [% END %] -[% IF NOT ( item.isa('Koha::Item') ) AND item.on_order %][%# on_order is only set from opac-detail.pl %] +[% IF Koha.Preference('OPACAcquisitionDetails') AND ( item.isa('Koha::Item') ) AND ( item.orders.filter_by_active.count ) %][%# on_order is only set from opac-detail.pl %] [% SET itemavailable = 0 %] On order [% END %] --- a/opac/opac-detail.pl +++ a/opac/opac-detail.pl @@ -650,19 +650,10 @@ $template->param( ); # Get items on order -my ( @itemnumbers_on_order ); if ( C4::Context->preference('OPACAcquisitionDetails' ) ) { - my $orders = C4::Acquisition::SearchOrders({ - biblionumber => $biblionumber, - ordered => 1, - }); + my $orders = $biblio->orders->filter_by_active; my $total_quantity = 0; - for my $order ( @$orders ) { - my $order = Koha::Acquisition::Orders->find( $order->{ordernumber} ); - my $basket = $order->basket; - if ( $basket->effective_create_items eq 'ordering' ) { - @itemnumbers_on_order = $order->items->get_column('itemnumber'); - } + while ( my $order = $orders->next ) { $total_quantity += $order->quantity; } $template->{VARS}->{acquisition_details} = { @@ -728,10 +719,6 @@ else { $item_info->{checkout} = $item->checkout; $item_info->{object} = $item; - if ( C4::Context->preference('OPACAcquisitionDetails') ) { - $item_info->{on_order} = 1 - if grep { $_ eq $item->itemnumber } @itemnumbers_on_order; - } if ( C4::Context->preference("OPACLocalCoverImages") == 1 ) { $item_info->{cover_images} = $item->cover_images; --