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 79736a6..5ef4ffe 100755 (executable)
--- a/cataloguing/moveitem.pl
+++ b/cataloguing/moveitem.pl
@@ -19,8 +19,8 @@
 # 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 Modern::Perl;
+
 use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Output;
@@ -31,9 +31,14 @@ use C4::Koha;
 use C4::ClassSource;
 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
@@ -55,25 +60,21 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user(
 
 
 
-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);
@@ -87,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,