Bug 30063: Remove svc/members/search

[srvgit] / acqui / orderreceive.pl

diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
index 7702b34..e1b76d3 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,
     }
 );
 
@@ -118,42 +114,6 @@ unless($acq_fw) {
     $template->param('NoACQframework' => 1);
 }
 
-my $AcqCreateItem = $basket->effective_create_items;
-if ($AcqCreateItem eq 'receiving') {
-    $template->param(
-        AcqCreateItemReceiving => 1,
-        UniqueItemFields => C4::Context->preference('UniqueItemFields'),
-    );
-} elsif ($AcqCreateItem eq 'ordering') {
-    my $fw = ($acq_fw) ? 'ACQ' : '';
-    my $items = $order->items;
-    $template->param(items => $items);
-}
-
-$order->quantityreceived = '' if $order->quantityreceived == 0;
-
-my $unitprice = $order->unitprice;
-my ( $rrp, $ecost );
-if ( $bookseller->invoiceincgst ) {
-    $rrp = $order->rrp_tax_included;
-    $ecost = $order->ecost_tax_included;
-    unless ( $unitprice != 0 and defined $unitprice) {
-        $unitprice = $order->ecost_tax_included;
-    }
-} else {
-    $rrp = $order->rrp_tax_excluded;
-    $ecost = $order->ecost_tax_excluded;
-    unless ( $unitprice != 0 and defined $unitprice) {
-        $unitprice = $order->ecost_tax_excluded;
-    }
-}
-
-my $tax_rate;
-if( defined $order->tax_rate_on_receiving ) {
-    $tax_rate = $order->tax_rate_on_receiving + 0.0;
-} else {
-    $tax_rate = $order->tax_rate_on_ordering + 0.0;
-}
 
 my $creator = Koha::Patrons->find( $order->created_by );
 
@@ -161,10 +121,10 @@ my $budget = GetBudget( $order->budget_id );
 
 my $datereceived = $order->datereceived ? dt_from_string( $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;
@@ -188,17 +148,13 @@ if ( $order->subscriptionid ) {
 }
 
 $template->param(
-    AcqCreateItem         => $AcqCreateItem,
-    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},
-    rrp                   => $rrp,
-    ecost                 => $ecost,
     creator               => $creator,
     invoiceid             => $invoice->{invoiceid},
     invoice               => $invoice->{invoicenumber},
@@ -208,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 );
 }
@@ -225,11 +181,14 @@ foreach my $period (@$periods) {
     my @funds;
     foreach my $r ( @{$budget_hierarchy} ) {
         next unless ( CanUserUseBudget( $patron, $r, $userflags ) );
+        if ( !defined $r->{budget_amount} || $r->{budget_amount} == 0 ) {
+            next;
+        }
         push @funds,
           {
             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,
           };
     }