[Koha-cvs] koha/circ returns.pl [rel_3_0]

[Bruno Toumi]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Bruno Toumi <btoumi>	06/11/10 09:47:50

Modified files:
	circ           : returns.pl 

Log message:
	(commit from Paul, even if it officially comes from btoumi)
	
	* removing set_transit
	* commenting printtransfert call, that is buggy
	* calling variable destbranchname instead of tobranchname
	
	WARNING :
	- transfer system now perfectly works for SAN-OP
	- subs commited by bob lyon 5-6 months ago have been removes, we think they are useless & causes bugs (duplicate transferts settings). We will have to speak of this on #koha & write some docs for sure !
	- this code is awfully written : things are mixed & merged => a BIG code cleaning will have to be done !!!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/circ/returns.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.43.2.3&r2=1.43.2.4

Patches:
Index: returns.pl
===================================================================
RCS file: /sources/koha/koha/circ/returns.pl,v
retrieving revision 1.43.2.3
retrieving revision 1.43.2.4
diff -u -b -r1.43.2.3 -r1.43.2.4
--- returns.pl	6 Nov 2006 09:00:37 -0000	1.43.2.3
+++ returns.pl	10 Nov 2006 09:47:50 -0000	1.43.2.4
@@ -126,7 +126,7 @@
     my $name    =
       $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'};
     my $slip = $query->param('resslip');
-    printreserve( \%env, $branchname, $borr, $iteminfo );
+    #printreserve( $branchname, $borr, $iteminfo );
 #   if ( $tobranchcd ne $branch ) { - not sure if line below is doing the same
     if ( $messages->{'transfert'} ) {
 # 	add the transfer routine
@@ -142,7 +142,6 @@
             borsurname    => $borr->{'surname'},
             diffbranch => 1
         );
-	set_transit($item);
     }
 }
 
@@ -267,7 +266,7 @@
 			debarred => $borr->{'debarred'},
 			gonenoaddress => $borr->{'gonenoaddress'},
 			currentbranch => $branches->{ $branch }->{'branchname'},
-            tobranchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
+            destbranchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
             waiting     => 1,
             itemnumber  => $res->{'itemnumber'},
             itemtitle   => $iteminfo->{'title'},
@@ -292,11 +291,13 @@
 			$template->param(intransit => 1);
 		}
 		  
+warn "RES FOR : ".$res->{'branchcode'};
         $template->param(
             found       => 1,
 		currentbranch => $branches->{ $branch }->{'branchname'},
 	    name        => $name,
-            branchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
+            destbranchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
+		transfertodo => ($branch eq $res->{'branchcode'}?0:1),
             reserved    => 1,
             today       => $todaysdate,
             itemnumber  => $res->{'itemnumber'},
@@ -534,24 +535,6 @@
 }
 
 
-sub set_transit {
-        my ($itemnumber) = @_;
-        my $dbh=C4::Context->dbh();
-        my $query = "UPDATE items SET holdingbranch='TRA' WHERE itemnumber = ?";
-        my $sth=$dbh->prepare($query);
-        $sth->execute($itemnumber);
-        $sth->finish();
-    }
-
-sub set_transit {
-        my ($itemnumber) = @_;
-        my $dbh=C4::Context->dbh();
-        my $query = "UPDATE items SET holdingbranch='TRA' WHERE itemnumber = ?";
-        my $sth=$dbh->prepare($query);
-        $sth->execute($itemnumber);
-        $sth->finish();
-}
-
 
 # Local Variables:
 # tab-width: 4