X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Fnewordersubscription.pl;h=e8d776598bfa51e66b864e8f8a37617ae3489df7;hb=2b8b02a5870e6d5941077106eae8d13c8b29d05a;hp=04173dbb2a7729e5770ce610d2f4e2ed67326e5f;hpb=469f36d38fe3ea82013d40b95892dfb7605b4e5f;p=koha-ffzg.git

diff --git a/acqui/newordersubscription.pl b/acqui/newordersubscription.pl
index 04173dbb2a..e8d776598b 100755
--- a/acqui/newordersubscription.pl
+++ b/acqui/newordersubscription.pl
@@ -4,31 +4,30 @@
 #
 # 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>.
 
 use Modern::Perl;
-use CGI;
-use C4::Acquisition;
-use C4::Auth;
-use C4::Branch;
+use CGI qw ( -utf8 );
+use C4::Acquisition qw( GetBasket );
+use C4::Auth qw( get_template_and_user );
 use C4::Context;
-use C4::Output;
-use C4::Serials;
+use C4::Output qw( output_html_with_http_headers );
+use C4::Serials qw( SearchSubscriptions subscriptionCurrentlyOnOrder check_routing );
 
-use Koha::Acquisition::Bookseller;
+use Koha::Acquisition::Booksellers;
 
-my $query        = new CGI;
+my $query        = CGI->new;
 my $title        = $query->param('title_filter');
 my $ISSN         = $query->param('ISSN_filter');
 my $EAN          = $query->param('EAN_filter');
@@ -46,14 +45,13 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
     {   template_name   => "acqui/newordersubscription.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'order_manage' },
     }
 );
 
 my $basket = GetBasket($basketno);
 $booksellerid = $basket->{booksellerid} unless $booksellerid;
-my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
+my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
 
 my @subscriptions;
 if ($searched) {
@@ -76,18 +74,6 @@ foreach my $sub (@subscriptions) {
     }
 }
 
-my $branches = GetBranches();
-my @branches_loop;
-foreach (sort keys %$branches){
-    my $selected = 0;
-    $selected = 1 if defined $branch && $branch eq $_;
-    push @branches_loop, {
-        branchcode  => $_,
-        branchname  => $branches->{$_}->{branchname},
-        selected    => $selected,
-    };
-}
-
 $template->param(
     subs_loop        => \@subscriptions,
     title_filter     => $title,
@@ -96,12 +82,11 @@ $template->param(
     publisher_filter => $publisher,
     supplier_filter  => $supplier,
     branch_filter    => $branch,
-    branches_loop    => \@branches_loop,
     done_searched    => $searched,
     routing          => $routing,
     booksellerid     => $booksellerid,
     basketno         => $basket->{basketno},
     basketname       => $basket->{basketname},
-    booksellername   => $bookseller->{name},
+    booksellername   => $bookseller->name,
 );
 output_html_with_http_headers $query, $cookie, $template->output;