Bug 30572: Dbrev for search_marc_to_field.sort

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

diff --git a/acqui/parcels.pl b/acqui/parcels.pl
index 0126fc0..cd6e256 100755 (executable)
--- a/acqui/parcels.pl
+++ b/acqui/parcels.pl
@@ -29,7 +29,7 @@ parcels.pl
 =head1 DESCRIPTION
 
 This script shows all orders/parcels receipt or pending for a given supplier.
-It allows to write an order/parcels as 'received' when he arrives.
+It allows to write an order/parcels as 'received' when it arrives.
 
 =head1 CGI PARAMETERS
 
@@ -66,16 +66,15 @@ To know how many results have to be display / page.
 
 =cut
 
-use strict;
-use warnings;
+use Modern::Perl;
 use CGI qw ( -utf8 );
-use C4::Auth;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
 
-use C4::Acquisition;
-use C4::Budgets;
+use C4::Acquisition qw( GetInvoices GetInvoice AddInvoice );
+use C4::Budgets qw( GetBudgetHierarchy GetBudget CanUserUseBudget );
 
-use Koha::Acquisition::Bookseller;
+use Koha::Acquisition::Booksellers;
 use Koha::DateUtils qw( output_pref dt_from_string );
 
 my $input          = CGI->new;
@@ -93,19 +92,15 @@ our ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
     {   template_name   => 'acqui/parcels.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'order_receive' },
-        debug           => 1,
     }
 );
 
 my $invoicenumber = $input->param('invoice');
-my $shipmentdate = $input->param('shipmentdate');
 my $shipmentcost = $input->param('shipmentcost');
 my $shipmentcost_budgetid = $input->param('shipmentcost_budgetid');
-if($shipmentdate) {
-    $shipmentdate = C4::Dates->new($shipmentdate)->output('iso');
-}
+my $shipmentdate = $input->param('shipmentdate');
+$shipmentdate and $shipmentdate = output_pref({ str => $shipmentdate, dateformat => 'iso', dateonly => 1 });
 
 if ( $op and $op eq 'new' ) {
     if ( C4::Context->preference('AcqWarnOnDuplicateInvoice') ) {
@@ -141,7 +136,7 @@ if ($op and $op eq 'confirm') {
     }
 }
 
-my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
+my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
 my @parcels = GetInvoices(
     supplierid => $booksellerid,
     invoicenumber => $code,
@@ -185,9 +180,6 @@ my $budget_loop = [];
 my $budgets = GetBudgetHierarchy;
 foreach my $r (@{$budgets}) {
     next unless (CanUserUseBudget($loggedinuser, $r, $flags));
-    if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) {
-        next;
-    }
     push @{$budget_loop}, {
         b_id  => $r->{budget_id},
         b_txt => $r->{budget_name},
@@ -205,10 +197,10 @@ $template->param(
     datefrom                 => $datefrom,
     dateto                   => $dateto,
     resultsperpage           => $resultsperpage,
-    name                     => $bookseller->{'name'},
-    shipmentdate_today       => C4::Dates->new()->output(),
+    name                     => $bookseller->name,
+    shipmentdate_today       => dt_from_string,
     booksellerid             => $booksellerid,
-    GST                      => C4::Context->preference('gist'),
+    GST                      => C4::Context->preference('TaxRates'),
     budgets                  => $budget_loop,
 );