[Koha-cvs] koha/circ branchreserves.pl currenttransfers.pl...

[LAURIN arnaud]

CVSROOT:	/sources/koha
Module name:	koha
Branch: 	
Changes by:	LAURIN arnaud <alaurin at savannah.gnu.org>	06/05/30 12:03:54

Modified files:
	circ           : branchreserves.pl currenttransfers.pl 
	                 waitingreservestransfers.pl 

Log message:
	bugfixing of the itemtypes infos in branchreserves,currenttransfers,waitingreservestransfers

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/circ/branchreserves.pl.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/circ/currenttransfers.pl.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/circ/waitingreservestransfers.pl.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: koha/circ/branchreserves.pl
diff -u koha/circ/branchreserves.pl:1.1 koha/circ/branchreserves.pl:1.2
--- koha/circ/branchreserves.pl:1.1	Fri May 19 17:01:03 2006
+++ koha/circ/branchreserves.pl	Tue May 30 12:03:54 2006
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: branchreserves.pl,v 1.1 2006/05/19 17:01:03 alaurin Exp $
+# $Id: branchreserves.pl,v 1.2 2006/05/30 12:03:54 alaurin Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -30,6 +30,7 @@
 use Date::Manip;
 use C4::Reserves2;
 use C4::Search;
+use C4::Koha;
 
 my $input = new CGI;
 
@@ -103,6 +104,7 @@
 	my %env;
 	my $gettitle = getiteminformation(\%env,$num->{'itemnumber'});
 	my $getborrower = getpatroninformation (\%env,$num->{'borrowernumber'});
+	my $itemtypeinfo = getitemtypeinfo($gettitle->{'itemtype'});
 	$getreserv{'waitingdate'} = format_date($num->{'waitingdate'});
 	my $calcDate=DateCalc($num->{'waitingdate'},"+".C4::Context->preference('ReservesMaxPickUpDelay')."  days");
 	my $warning=Date_Cmp(ParseDate("today"),$calcDate);
@@ -113,7 +115,7 @@
 	$getreserv{'itemnumber'} = $gettitle->{'itemnumber'};
 	$getreserv{'biblionumber'} = $gettitle->{'biblionumber'};
 	$getreserv{'barcode'} = $gettitle->{'barcode'};
-# 	$getreserv{'itemtype'} = ItemType($gettitle->{'itemtype'});
+	$getreserv{'itemtype'} = $itemtypeinfo->{'description'};
 	$getreserv{'homebranch'} = $gettitle->{'homebranch'};
 	$getreserv{'holdingbranch'} = $gettitle->{'holdingbranch'};
 	if ($gettitle->{'homebranch'} ne $gettitle->{'holdingbranch'}){
Index: koha/circ/currenttransfers.pl
diff -u koha/circ/currenttransfers.pl:1.1 koha/circ/currenttransfers.pl:1.2
--- koha/circ/currenttransfers.pl:1.1	Fri May 19 17:01:03 2006
+++ koha/circ/currenttransfers.pl	Tue May 30 12:03:54 2006
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: currenttransfers.pl,v 1.1 2006/05/19 17:01:03 alaurin Exp $
+# $Id: currenttransfers.pl,v 1.2 2006/05/30 12:03:54 alaurin Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -78,12 +78,14 @@
 				$getransf{'messcompa'} = 1;
 			}
 			my $gettitle = getiteminformation(\%env,$num->{'itemnumber'});
+			my $itemtypeinfo = getitemtypeinfo($gettitle->{'itemtype'});
+			
 				$getransf{'title'} = $gettitle->{'title'};
 				$getransf{'datetransfer'} = format_date($num->{'datesent'});
 				$getransf{'biblionumber'} = $gettitle->{'biblionumber'};
 				$getransf{'itemnumber'} = $gettitle->{'itemnumber'};
 				$getransf{'barcode'} = $gettitle->{'barcode'};
-# 				$getransf{'itemtype'} = ItemType($gettitle->{'itemtype'});
+				$getransf{'itemtype'} = $itemtypeinfo->{'description'};
 				$getransf{'homebranch'} = $gettitle->{'homebranch'};
 				$getransf{'holdingbranch'} = $gettitle->{'holdingbranch'};
 				$getransf{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
Index: koha/circ/waitingreservestransfers.pl
diff -u koha/circ/waitingreservestransfers.pl:1.1 koha/circ/waitingreservestransfers.pl:1.2
--- koha/circ/waitingreservestransfers.pl:1.1	Fri May 19 17:01:03 2006
+++ koha/circ/waitingreservestransfers.pl	Tue May 30 12:03:54 2006
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: waitingreservestransfers.pl,v 1.1 2006/05/19 17:01:03 alaurin Exp $
+# $Id: waitingreservestransfers.pl,v 1.2 2006/05/30 12:03:54 alaurin Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -74,6 +74,7 @@
 			my %getreserv;
 			my %env;
 			my $gettitle = getiteminformation(\%env,$num->{'itemnumber'});
+			my $itemtypeinfo = getitemtypeinfo($gettitle->{'itemtype'});
 			if ($gettitle->{'holdingbranch'} eq $default){
 				my $getborrower = getpatroninformation (\%env,$num->{'borrowernumber'});
 				$getreserv{'reservedate'} = format_date($num->{'reservedate'});
@@ -86,7 +87,7 @@
 				$getreserv{'biblionumber'} = $gettitle->{'biblionumber'};
 				$getreserv{'itemnumber'} = $gettitle->{'itemnumber'};
 				$getreserv{'barcode'} = $gettitle->{'barcode'};
-# 				$getreserv{'itemtype'} = get_iteminfos_of($gettitle->{'itemtype'}->{'description'});
+				$getreserv{'itemtype'} = $itemtypeinfo->{'description'};
 				$getreserv{'holdingbranch'} = $gettitle->{'holdingbranch'};
 				$getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
 				$getreserv{'borrowernum'} = $getborrower->{'borrowernumber'};