Bug 19166: (follow-up) Add ADJ_REASON auhtorised value category and minor fixes

[koha.git] / acqui / orderreceive.pl

diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
index 752beba..4dbb5f0 100755 (executable)
--- a/acqui/orderreceive.pl
+++ b/acqui/orderreceive.pl
@@ -58,8 +58,7 @@ The biblionumber of this order.
 
 =cut
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
 use C4::Context;
@@ -74,8 +73,10 @@ use C4::Suggestions;
 use C4::Koha;
 
 use Koha::Acquisition::Booksellers;
+use Koha::Acquisition::Orders;
 use Koha::DateUtils qw( dt_from_string );
 use Koha::ItemTypes;
+use Koha::Patrons;
 
 my $input      = new CGI;
 
@@ -110,6 +111,7 @@ unless ( $results and @$results) {
 
 # prepare the form for receiving
 my $order = $results->[0];
+my $basket = Koha::Acquisition::Orders->find( $ordernumber )->basket;
 
 # Check if ACQ framework exists
 my $acq_fw = GetMarcStructure( 1, 'ACQ', { unsafe => 1 } );
@@ -117,7 +119,7 @@ unless($acq_fw) {
     $template->param('NoACQframework' => 1);
 }
 
-my $AcqCreateItem = C4::Context->preference('AcqCreateItem');
+my $AcqCreateItem = $basket->effective_create_items;
 if ($AcqCreateItem eq 'receiving') {
     $template->param(
         AcqCreateItemReceiving => 1,
@@ -145,8 +147,10 @@ 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::ItemsTypes->find( $item->{itype} );
-        $item->{itemtype} = $itemtype->description; # FIXME Should not it be translated_description?
+        my $itemtype = Koha::ItemTypes->find( $item->{itype} );
+        if (defined $itemtype) {
+            $item->{itemtype} = $itemtype->description; # FIXME Should not it be translated_description?
+        }
         push @items, $item;
     }
     $template->param(items => \@items);
@@ -179,8 +183,7 @@ if( defined $order->{tax_rate_on_receiving} ) {
 
 my $suggestion = GetSuggestionInfoFromBiblionumber($order->{biblionumber});
 
-my $authorisedby = $order->{authorisedby};
-my $member = GetMember( borrowernumber => $authorisedby );
+my $creator = Koha::Patrons->find( $order->{created_by} );
 
 my $budget = GetBudget( $order->{budget_id} );
 
@@ -213,8 +216,7 @@ $template->param(
     ecost                 => $ecost,
     unitprice             => $unitprice,
     tax_rate              => $tax_rate,
-    memberfirstname       => $member->{firstname} || "",
-    membersurname         => $member->{surname} || "",
+    creator               => $creator,
     invoiceid             => $invoice->{invoiceid},
     invoice               => $invoice->{invoicenumber},
     datereceived          => $datereceived,
@@ -226,7 +228,7 @@ $template->param(
     gst_values            => \@gst_values,
 );
 
-my $borrower = GetMember( 'borrowernumber' => $loggedinuser );
+my $patron = Koha::Patrons->find( $loggedinuser )->unblessed;
 my @budget_loop;
 my $periods = GetBudgetPeriods( );
 foreach my $period (@$periods) {
@@ -237,7 +239,7 @@ foreach my $period (@$periods) {
     my $budget_hierarchy = GetBudgetHierarchy( $period->{'budget_period_id'} );
     my @funds;
     foreach my $r ( @{$budget_hierarchy} ) {
-        next unless ( CanUserUseBudget( $borrower, $r, $userflags ) );
+        next unless ( CanUserUseBudget( $patron, $r, $userflags ) );
         if ( !defined $r->{budget_amount} || $r->{budget_amount} == 0 ) {
             next;
         }