Bug 22420: Remove wrong calculation on approved tags

[srvgit] / opac / opac-detail.pl

diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index d81a2a1..c859771 100755 (executable)
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -481,21 +481,22 @@ $template->param(
     OPACShowCheckoutName => C4::Context->preference("OPACShowCheckoutName"),
 );
 
-# adding items linked via host biblios
-
-my $analyticfield = '773';
-if ($marcflavour eq 'MARC21' || $marcflavour eq 'NORMARC'){
-    $analyticfield = '773';
-} elsif ($marcflavour eq 'UNIMARC') {
-    $analyticfield = '461';
-}
-foreach my $hostfield ( $record->field($analyticfield)) {
-    my $hostbiblionumber = $hostfield->subfield("0");
-    my $linkeditemnumber = $hostfield->subfield("9");
-    my @hostitemInfos = GetItemsInfo($hostbiblionumber);
-    foreach my $hostitemInfo (@hostitemInfos){
-        if ($hostitemInfo->{itemnumber} eq $linkeditemnumber){
-            push(@all_items, $hostitemInfo);
+if ( C4::Context->preference('EasyAnalyticalRecords') ) {
+    # adding items linked via host biblios
+    my $analyticfield = '773';
+    if ($marcflavour eq 'MARC21' || $marcflavour eq 'NORMARC'){
+        $analyticfield = '773';
+    } elsif ($marcflavour eq 'UNIMARC') {
+        $analyticfield = '461';
+    }
+    foreach my $hostfield ( $record->field($analyticfield)) {
+        my $hostbiblionumber = $hostfield->subfield("0");
+        my $linkeditemnumber = $hostfield->subfield("9");
+        my @hostitemInfos = GetItemsInfo($hostbiblionumber);
+        foreach my $hostitemInfo (@hostitemInfos){
+            if ($hostitemInfo->{itemnumber} eq $linkeditemnumber){
+                push(@all_items, $hostitemInfo);
+            }
         }
     }
 }
@@ -593,6 +594,7 @@ foreach my $subscription (@subscriptions) {
     $cell{histenddate}       = $subscription->{histenddate};
     $cell{branchcode}        = $subscription->{branchcode};
     $cell{callnumber}        = $subscription->{callnumber};
+    $cell{location}          = $subscription->{location};
     $cell{closed}            = $subscription->{closed};
     $cell{letter}            = $subscription->{letter};
     $cell{biblionumber}      = $subscription->{biblionumber};
@@ -655,13 +657,12 @@ if ( C4::Context->preference('OPACAcquisitionDetails' ) ) {
     });
     my $total_quantity = 0;
     for my $order ( @$orders ) {
-        my $basket = Koha::Acquisition::Orders->find( $order->{ordernumber} )->basket;
+        my $order = Koha::Acquisition::Orders->find( $order->{ordernumber} );
+        my $basket = $order->basket;
         if ( $basket->effective_create_items eq 'ordering' ) {
-            for my $itemnumber ( C4::Acquisition::GetItemnumbersFromOrder( $order->{ordernumber} ) ) {
-                push @itemnumbers_on_order, $itemnumber;
-            }
+            @itemnumbers_on_order = $order->items->get_column('itemnumber');
         }
-        $total_quantity += $order->{quantity};
+        $total_quantity += $order->quantity;
     }
     $template->{VARS}->{acquisition_details} = {
         total_quantity => $total_quantity,
@@ -846,9 +847,7 @@ $template->param(
 );
 
 # COinS format FIXME: for books Only
-$template->param(
-    ocoins => GetCOinSBiblio($record),
-);
+$template->param( ocoins => $biblio->get_coins );
 
 my ( $loggedincommenter, $reviews );
 if ( C4::Context->preference('reviewson') ) {