Bug 10950: (QA follow-up) Fix typo in hidden check in OPAC patron form

[koha-ffzg.git] / acqui / orderreceive.pl

diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
index 49b9231..c690dca 100755 (executable)
--- a/acqui/orderreceive.pl
+++ b/acqui/orderreceive.pl
@@ -62,24 +62,22 @@ use Modern::Perl;
 
 use CGI qw ( -utf8 );
 use C4::Context;
-use C4::Acquisition;
-use C4::Auth;
-use C4::Output;
-use C4::Budgets qw/ GetBudget GetBudgetHierarchy CanUserUseBudget GetBudgetPeriods /;
+use C4::Acquisition qw( GetInvoice );
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
+use C4::Budgets qw( GetBudget GetBudgetPeriods GetBudgetPeriod GetBudgetHierarchy CanUserUseBudget );
 use C4::Members;
-use C4::Items;
-use C4::Biblio;
-use C4::Suggestions;
-use C4::Koha;
+use C4::Biblio qw( GetMarcStructure );
+use C4::Suggestions qw( GetSuggestion GetSuggestionInfoFromBiblionumber GetSuggestionInfo );
 
 use Koha::Acquisition::Booksellers;
-use Koha::Acquisition::Currencies;
+use Koha::Acquisition::Currencies qw( get_active );
 use Koha::Acquisition::Orders;
 use Koha::DateUtils qw( dt_from_string );
 use Koha::ItemTypes;
 use Koha::Patrons;
 
-my $input      = new CGI;
+my $input      = CGI->new;
 
 my $dbh          = C4::Context->dbh;
 my $invoiceid    = $input->param('invoiceid');
@@ -96,9 +94,7 @@ my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
         template_name   => "acqui/orderreceive.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => {acquisition => 'order_receive'},
-        debug           => 1,
     }
 );
 
@@ -123,12 +119,12 @@ my $creator = Koha::Patrons->find( $order->created_by );
 
 my $budget = GetBudget( $order->budget_id );
 
-my $datereceived = $order->datereceived ? dt_from_string( $order->datereceived ) : dt_from_string;
+my $datereceived = $order->datereceived || dt_from_string;
 
-# get option values for gist syspref
+# get option values for TaxRates syspref
 my @gst_values = map {
     option => $_ + 0.0
-}, split( '\|', C4::Context->preference("gist") );
+}, split( '\|', C4::Context->preference("TaxRates") );
 
 my $order_internalnote = $order->order_internalnote;
 my $order_vendornote   = $order->order_vendornote;
@@ -152,12 +148,11 @@ if ( $order->subscriptionid ) {
 }
 
 $template->param(
-    count                 => 1,
     order                 => $order,
     freight               => $freight,
     name                  => $bookseller->name,
     active_currency       => $active_currency,
-    currencies            => scalar $currencies->search({ rate => { '!=' => 1 } }),
+    currencies            => $currencies->search({ rate => { '!=' => 1 } }),
     invoiceincgst         => $bookseller->invoiceincgst,
     bookfund              => $budget->{budget_name},
     creator               => $creator,
@@ -169,7 +164,7 @@ $template->param(
     gst_values            => \@gst_values,
 );
 
-my $suggestion = GetSuggestionInfoFromBiblionumber($order->{biblionumber});
+my $suggestion = GetSuggestionInfoFromBiblionumber($order->biblionumber);
 if ( $suggestion ) {
     $template->param( suggestion => $suggestion );
 }
@@ -182,7 +177,7 @@ foreach my $period (@$periods) {
         $template->{'VARS'}->{'budget_period_description'} = $period->{'budget_period_description'};
     }
     next if $period->{'budget_period_locked'} || !$period->{'budget_period_description'};
-    my $budget_hierarchy = GetBudgetHierarchy( $period->{'budget_period_id'} );
+    my $budget_hierarchy = GetBudgetHierarchy( $period->{'budget_period_id'}, undef, undef, 1 );
     my @funds;
     foreach my $r ( @{$budget_hierarchy} ) {
         next unless ( CanUserUseBudget( $patron, $r, $userflags ) );
@@ -193,7 +188,7 @@ foreach my $period (@$periods) {
           {
             b_id  => $r->{budget_id},
             b_txt => $r->{budget_name},
-            b_sel => ( $r->{budget_id} == $order->{budget_id} ) ? 1 : 0,
+            b_sel => ( $r->{budget_id} == $order->budget_id ) ? 1 : 0,
           };
     }