fix pdf generation by removing obsolete module

[koha.git] / acqui / orderreceive.pl

diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
index 1db00d3..a9d3201 100755 (executable)
--- a/acqui/orderreceive.pl
+++ b/acqui/orderreceive.pl
@@ -130,10 +130,10 @@ if ($AcqCreateItem eq 'receiving') {
     );
 } elsif ($AcqCreateItem eq 'ordering') {
     my $fw = ($acq_fw) ? 'ACQ' : '';
-    my @itemnumbers = $order_object->items->get_column('itemnumber');
+    my $items = $order_object->items;
     my @items;
-    foreach (@itemnumbers) {
-        my $item = GetItem($_); # FIXME We do not need this call, we already have the Koha::Items
+    while ( my $i = $items->next ) {
+        my $item = $i->unblessed;
         my $descriptions;
         $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => $fw, kohafield => 'items.notforloan', authorised_value => $item->{notforloan} });
         $item->{notforloan} = $descriptions->{lib} // '';
@@ -150,8 +150,9 @@ if ($AcqCreateItem eq 'receiving') {
         $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => $fw, kohafield => 'items.materials', authorised_value => $item->{materials} });
         $item->{materials} = $descriptions->{lib} // '';
 
-        my $itemtype = Koha::ItemTypes->find( $item->{itype} );
+        my $itemtype = Koha::ItemTypes->find($i->effective_itemtype);
         if (defined $itemtype) {
+            # We should not do that here, but call ->itemtype->description when needed instead
             $item->{itemtype} = $itemtype->description; # FIXME Should not it be translated_description?
         }
         push @items, $item;
@@ -197,6 +198,27 @@ my @gst_values = map {
     option => $_ + 0.0
 }, split( '\|', C4::Context->preference("gist") );
 
+my $order_internalnote = $order->{order_internalnote};
+my $order_vendornote   = $order->{order_vendornote};
+if ( $order->{subscriptionid} ) {
+    # Order from a subscription, we will display an history of what has been received
+    my $orders = Koha::Acquisition::Orders->search(
+        {
+            subscriptionid     => $order->{subscriptionid},
+            parent_ordernumber => $order->{ordernumber},
+            ordernumber        => { '!=' => $order->{ordernumber} }
+        }
+    );
+    if ( $order->{parent_ordernumber} != $order->{ordernumber} ) {
+        my $parent_order = Koha::Acquisition::Orders->find($order->{parent_ordernumber});
+        $order_internalnote = $parent_order->{order_internalnote};
+        $order_vendornote   = $parent_order->{order_vendornote};
+    }
+    $template->param(
+        orders => $orders,
+    );
+}
+
 $template->param(
     AcqCreateItem         => $AcqCreateItem,
     count                 => 1,
@@ -228,8 +250,8 @@ $template->param(
     invoiceid             => $invoice->{invoiceid},
     invoice               => $invoice->{invoicenumber},
     datereceived          => $datereceived,
-    order_internalnote    => $order->{order_internalnote},
-    order_vendornote      => $order->{order_vendornote},
+    order_internalnote    => $order_internalnote,
+    order_vendornote      => $order_vendornote,
     suggestionid          => $suggestion->{suggestionid},
     surnamesuggestedby    => $suggestion->{surnamesuggestedby},
     firstnamesuggestedby  => $suggestion->{firstnamesuggestedby},