Bug 15774: Add additional fields to order baskets

[koha.git] / acqui / parcels.pl

diff --git a/acqui/parcels.pl b/acqui/parcels.pl
index e3b8f5f..c0a330b 100755 (executable)
--- a/acqui/parcels.pl
+++ b/acqui/parcels.pl
@@ -9,18 +9,18 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 =head1 NAME
 
@@ -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,17 +66,16 @@ To know how many results have to be display / page.
 
 =cut
 
-use strict;
-use warnings;
-use CGI;
+use Modern::Perl;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Output;
 
-use C4::Dates qw/format_date/;
 use C4::Acquisition;
 use C4::Budgets;
 
-use Koha::Acquisition::Bookseller;
+use Koha::Acquisition::Booksellers;
+use Koha::DateUtils qw( output_pref dt_from_string );
 
 my $input          = CGI->new;
 my $booksellerid     = $input->param('booksellerid');
@@ -100,12 +99,10 @@ our ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
 );
 
 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,12 +138,12 @@ 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,
-    shipmentdatefrom => $datefrom,
-    shipmentdateto => $dateto,
+    ( $datefrom ? ( shipmentdatefrom => output_pref({ dt => dt_from_string($datefrom), dateformat => 'iso' }) ) : () ),
+    ( $dateto   ? ( shipmentdateto   => output_pref({ dt => dt_from_string($dateto),   dateformat => 'iso' }) )    : () ),
     order_by => $order
 );
 my $count_parcels = @parcels;
@@ -205,8 +202,8 @@ $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'),
     budgets                  => $budget_loop,