Bug 30933: Adjust pref description, include ListOwnerDesignated

[srvgit] / acqui / newordersuggestion.pl

diff --git a/acqui/newordersuggestion.pl b/acqui/newordersuggestion.pl
index 839b4f4..9d35ec4 100755 (executable)
--- a/acqui/newordersuggestion.pl
+++ b/acqui/newordersuggestion.pl
@@ -5,18 +5,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
 
@@ -88,18 +88,18 @@ can be equal to
 
 =cut
 
-use strict;
-#use warnings; FIXME - Bug 2505
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
-use C4::Auth;    # get_template_and_user
-use C4::Output;
-use C4::Suggestions;
-use C4::Biblio;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
+use C4::Suggestions qw( ConnectSuggestionAndBiblio );
+use C4::Budgets;
 
-use Koha::Acquisition::Bookseller;
+use Koha::Acquisition::Booksellers;
+use Koha::Suggestions;
 
-my $input = new CGI;
+my $input = CGI->new;
 
 # getting the CGI params
 my $basketno        = $input->param('basketno');
@@ -128,22 +128,22 @@ if ( $op eq 'connectDuplicate' ) {
     ConnectSuggestionAndBiblio( $suggestionid, $duplicateNumber );
 }
 
-# getting all suggestions.
-my $suggestions_loop = SearchSuggestion(
+my $suggestions = [ Koha::Suggestions->search_limited(
     {
-        author        => $author,
-        title         => $title,
-        publishercode => $publishercode,
-        STATUS        => 'ACCEPTED'
-    }
-);
-my $vendor = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
+        ( $author        ? ( author        => $author )        : () ),
+        ( $title         ? ( title         => $title )         : () ),
+        ( $publishercode ? ( publishercode => $publishercode ) : () ),
+        STATUS => 'ACCEPTED'
+    },
+    { prefetch => ['managedby', 'suggestedby'] },
+)->as_list ];
+
+my $vendor = Koha::Acquisition::Booksellers->find( $booksellerid );
 $template->param(
-    suggestions_loop        => $suggestions_loop,
+    suggestions             => $suggestions,
     basketno                => $basketno,
     booksellerid              => $booksellerid,
-    name                                       => $vendor->{'name'},
-    loggedinuser            => $borrowernumber,
+    name                    => $vendor->name,
     "op_$op"                => 1,
 );