Bug 12062: Follow up to fix more untraslatable cases

[koha_fer] / catalogue / detail.pl

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 25893be..3f71a87 100755 (executable)
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -20,7 +20,7 @@ use strict;
 use warnings;
 
 use CGI;
-use C4::Acquisition qw( GetHistory GetItemnumbersFromOrder );
+use C4::Acquisition qw( GetHistory );
 use C4::Auth;
 use C4::Dates qw/format_date/;
 use C4::Koha;
@@ -167,16 +167,12 @@ foreach my $subscription (@subscriptions) {
 
 
 # Get acquisition details
-my ( $orders, $qty, $price, $received ) = C4::Acquisition::GetHistory( biblionumber => $biblionumber, get_canceled_order => 1 );
-if ( C4::Context->preference('AcqCreateItem') eq 'ordering' ) {
-    for my $order ( @$orders ) {
-        $order->{itemnumbers} = [ C4::Acquisition::GetItemnumbersFromOrder( $order->{ordernumber} ) ];
-    }
+if ( C4::Context->preference('AcquisitionDetails') ) {
+    my ( $orders, $qty, $price, $received ) = C4::Acquisition::GetHistory( biblionumber => $biblionumber, get_canceled_order => 1 );
+    $template->param(
+        orders => $orders,
+    );
 }
-$template->param(
-    orders => $orders,
-    AcquisitionDetails => C4::Context->preference('AcquisitionDetails'),
-);
 
 if ( defined $dat->{'itemtype'} ) {
     $dat->{imageurl} = getitemtypeimagelocation( 'intranet', $itemtypes->{ $dat->{itemtype} }{imageurl} );
@@ -249,7 +245,7 @@ foreach my $item (@items) {
         $item->{ExpectedAtLibrary}      = $branches->{$expectedAt}{branchname};
         $item->{Reservedcardnumber}             = $ItemBorrowerReserveInfo->{'cardnumber'};
         # Check waiting status
-        $item->{waitingdate} = format_date($wait) if $wait;
+        $item->{waitingdate} = $wait;
     }
 
 
@@ -418,8 +414,10 @@ if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->pref
                                 'sort'=>'-weight', limit=>$tag_quantity}));
 }
 
-my ( $holdcount, $holds ) = C4::Reserves::GetReservesFromBiblionumber($biblionumber,1);
-$template->param( holdcount => $holdcount, holds => $holds );
+#we only need to pass the number of holds to the template
+my $holds = C4::Reserves::GetReservesFromBiblionumber({ biblionumber => $biblionumber, all_dates => 1 });
+$template->param( holdcount => scalar ( @$holds ) );
+
 my $StaffDetailItemSelection = C4::Context->preference('StaffDetailItemSelection');
 if ($StaffDetailItemSelection) {
     # Only enable item selection if user can execute at least one action