Bug 17715: Remove itemtype-related t/db_dependent/Holds/RevertWaitingStatus.t warnings

[srvgit] / cataloguing / moveitem.pl

diff --git a/cataloguing/moveitem.pl b/cataloguing/moveitem.pl
index 0f842ca..79736a6 100755 (executable)
--- a/cataloguing/moveitem.pl
+++ b/cataloguing/moveitem.pl
@@ -6,30 +6,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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 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 CGI;
 use strict;
+#use warnings; FIXME - Bug 2505
+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 Date::Calc qw(Today);
 
@@ -42,14 +42,16 @@ 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,
-                 flagsrequired => {editcatalogue => 1},
-                 debug => 1,
-                 });
+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,
+    }
+);
 
 
 
@@ -70,23 +72,11 @@ if ($barcode && $biblionumber) {
        if ($item) {
 
            my $results = GetBiblioFromItemNumber($itemnumber, $barcode);
-        my $frombiblionumber = $results->{'biblionumber'};
+           my $frombiblionumber = $results->{'biblionumber'};
           
            my $moveresult = MoveItemFromBiblio($itemnumber, $frombiblionumber, $biblionumber); 
-
            if ($moveresult) { 
-                               my $order = GetOrderFromItemnumber($itemnumber);
-                               if ($order){
-                                       $order->{'biblionumber'} = $biblionumber;
-                                       ModOrder($order);
-                                       my $orderitem = {
-                                               ordernumber => $order->{'ordernumber'},
-                                               itemnumber => $itemnumber,
-                                               newitemnumber => $itemnumber,
-                                       };
-                                       ModOrderItem($orderitem);
-                               }
-                    $template->param(success => 1);
+               $template->param(success => 1);
            } else {
                $template->param(error => 1,
                                 errornonewitem => 1);