Bug 20047: (follow-up) Retrieve only biblio/authority servers as appropriate

[koha.git] / cataloguing / moveitem.pl

diff --git a/cataloguing/moveitem.pl b/cataloguing/moveitem.pl
index 24414cc..5ef4ffe 100755 (executable)
--- a/cataloguing/moveitem.pl
+++ b/cataloguing/moveitem.pl
@@ -6,35 +6,39 @@
 #
 # 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 strict;
-#use warnings; FIXME - Bug 2505
-use CGI;
+use Modern::Perl;
+
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Output;
 use C4::Biblio;
 use C4::Items;
 use C4::Context;
 use C4::Koha;
-use C4::Branch;
 use C4::ClassSource;
-use C4::Acquisition qw/GetOrderFromItemnumber ModOrder GetOrder ModOrderItem/;
+use C4::Acquisition qw/GetOrderFromItemnumber ModOrder GetOrder/;
+
+use Koha::Biblios;
 
 use Date::Calc qw(Today);
 
 use MARC::File::XML;
+
+use Koha::Items;
+
 my $query = CGI->new;
 
 # The biblio to move the item to
@@ -43,36 +47,34 @@ my $biblionumber = $query->param('biblionumber');
 # The barcode of the item to move
 my $barcode     = $query->param('barcode');
 
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/moveitem.tmpl",
-                 query => $query,
-                 type => "intranet",
-                 authnotrequired => 0,
+my ($template, $loggedinuser, $cookie) = get_template_and_user(
+    {
+        template_name   => "cataloguing/moveitem.tt",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
         flagsrequired   => { editcatalogue => 'edit_items' },
-                 debug => 1,
-                 });
+        debug           => 1,
+    }
+);
 
 
 
-my $biblio = GetBiblioData($biblionumber);
-$template->param(bibliotitle => $biblio->{'title'});
+my $biblio = Koha::Biblios->find( $biblionumber );
+$template->param(bibliotitle => $biblio->title);
 $template->param(biblionumber => $biblionumber);
 
 # If we already have the barcode of the item to move and the biblionumber to move the item to
 if ($barcode && $biblionumber) { 
-    
-    # We get his itemnumber
-    my $itemnumber = GetItemnumberFromBarcode($barcode);
 
-    if ($itemnumber) {
-       # And then, we get the item
-       my $item = GetItem($itemnumber);
+    my $itemnumber;
+    my $item = Koha::Items->find({ barcode => $barcode });
 
-       if ($item) {
+    if ($item) {
+
+        $itemnumber = $item->itemnumber;
+        my $frombiblionumber = $item->biblionumber;
 
-           my $results = GetBiblioFromItemNumber($itemnumber, $barcode);
-           my $frombiblionumber = $results->{'biblionumber'};
-          
            my $moveresult = MoveItemFromBiblio($itemnumber, $frombiblionumber, $biblionumber); 
            if ($moveresult) { 
                $template->param(success => 1);
@@ -86,11 +88,6 @@ if ($barcode && $biblionumber) {
            $template->param(error => 1,
                             errornoitem => 1);
        }
-    } else {
-           $template->param(error => 1,
-                            errornoitemnumber => 1);
-
-    }
     $template->param(
                        barcode => $barcode,  
                        itemnumber => $itemnumber,