Bug 15109: Make name the default sort order for all patron searches

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

diff --git a/acqui/parcels.pl b/acqui/parcels.pl
index 3565d6d..0126fc0 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
 
@@ -68,15 +68,16 @@ To know how many results have to be display / page.
 
 use strict;
 use warnings;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Output;
 
-use C4::Dates qw/format_date/;
 use C4::Acquisition;
-use C4::Bookseller qw/ GetBookSellerFromId /;
 use C4::Budgets;
 
+use Koha::Acquisition::Bookseller;
+use Koha::DateUtils qw( output_pref dt_from_string );
+
 my $input          = CGI->new;
 my $booksellerid     = $input->param('booksellerid');
 my $order          = $input->param('orderby') || 'shipmentdate desc';
@@ -89,7 +90,7 @@ my $op             = $input->param('op');
 $resultsperpage ||= 20;
 
 our ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
-    {   template_name   => 'acqui/parcels.tmpl',
+    {   template_name   => 'acqui/parcels.tt',
         query           => $input,
         type            => 'intranet',
         authnotrequired => 0,
@@ -140,12 +141,12 @@ if ($op and $op eq 'confirm') {
     }
 }
 
-my $bookseller = GetBookSellerFromId($booksellerid);
+my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $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;