From: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date: Tue, 15 Sep 2009 22:00:28 +0000 (+0200)
Subject: MT 0001094, Follow-up : Enhancement : Item is moved rather than deleted and re-created
X-Git-Tag: v3.02.00-alpha~54^2~248
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=9995ff8fd156866e363b09f02ef0ca505191fe08;p=srvgit

MT 0001094, Follow-up : Enhancement : Item is moved rather than deleted and re-created
---

diff --git a/cataloguing/moveitem.pl b/cataloguing/moveitem.pl
index a461600ef0..67cdf685ee 100755
--- a/cataloguing/moveitem.pl
+++ b/cataloguing/moveitem.pl
@@ -65,54 +65,47 @@ if ($barcode && $biblionumber) {
 
     if ($itemnumber) {
     	# And then, we get the item
-		my $item = GetItem($itemnumber);
-
-		if ($item) {
-
-			# We delete the item from the old record (we can't delete afterwards, because of constraint on barcode duplicity)
-			my $results = GetBiblioFromItemNumber($itemnumber, $barcode);
-			my $frombiblionumber = $results->{'biblionumber'};
-
-			my $order = GetOrderFromItemnumber($itemnumber);
-			if ($order){
-				$order->{'biblionumber'} = $biblionumber;
-				ModOrder($order);
-			}
-				
-			if ($frombiblionumber) {
-				DelItem(C4::Context->dbh, $frombiblionumber, $itemnumber);
-			}
-
-			# We add the item to the requested record
-			my ($biblionumber, $biblioitemnumber, $newitemnumber) = AddItem($item, $biblionumber);
-
-			if ($order){
-				my $orderitem = {
-					ordernumber => $order->{'ordernumber'},
-					itemnumber => $itemnumber,
-					newitemnumber => $newitemnumber,
-				};
-				ModOrderItem($orderitem);
-			}
-				
-			if ($newitemnumber) { 
-				$template->param(success => 1);
-			} else {
-				$template->param(error => 1,
-								 errornonewitem => 1); 
-			}
-		} else {
-			$template->param(error => 1,
-					 errornoitem => 1);
+	my $item = GetItem($itemnumber);
+
+	if ($item) {
+
+	    my $results = GetBiblioFromItemNumber($itemnumber, $barcode);
+            my $frombiblionumber = $results->{'biblionumber'};
+	   
+	    my $moveresult = MoveItemFromBiblio($itemnumber, $frombiblionumber, $biblionumber); 
+		my $order = GetOrderFromItemnumber($itemnumber);
+		if ($order){
+			$order->{'biblionumber'} = $biblionumber;
+			ModOrder($order);
+			my $orderitem = {
+				ordernumber => $order->{'ordernumber'},
+				itemnumber => $itemnumber,
+				newitemnumber => $newitemnumber,
+			};
+			ModOrderItem($orderitem);
 		}
+	    if ($moveresult) { 
+	             $template->param(success => 1);
+	    } else {
+		$template->param(error => 1,
+				 errornonewitem => 1); 
+	    }
+
+
+	} else {
+	    $template->param(error => 1,
+	                     errornoitem => 1);
+	}
     } else {
-	$template->param(error => 1,
-			 errornoitemnumber => 1);
+	    $template->param(error => 1,
+			     errornoitemnumber => 1);
+
     }
     $template->param(
 			barcode => $barcode,  
 			itemnumber => $itemnumber,
 		    );
+
 } else {
     $template->param(missingparameter => 1);
     if (!$barcode)      { $template->param(missingbarcode      => 1); }