[Koha-cvs] koha circ/returns.pl circ/branchtransfers.pl re... [dev_week]

[Joshua Ferraro]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Joshua Ferraro <kados>	06/10/05 19:02:44

Modified files:
	circ           : returns.pl branchtransfers.pl 
	.              : request.pl 

Log message:
	bugfix #1192: returns.pl, branchtransfers.pl, and request.pl need to be modified to pass new
	ccode variable to the template.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/circ/returns.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.37.2.6.2.1&r2=1.37.2.6.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchtransfers.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.20.4.8&r2=1.20.4.8.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/request.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.28.2.4&r2=1.28.2.4.2.1

Patches:
Index: circ/returns.pl
===================================================================
RCS file: /sources/koha/koha/circ/returns.pl,v
retrieving revision 1.37.2.6.2.1
retrieving revision 1.37.2.6.2.2
diff -u -b -r1.37.2.6.2.1 -r1.37.2.6.2.2
--- circ/returns.pl	27 Aug 2006 00:22:16 -0000	1.37.2.6.2.1
+++ circ/returns.pl	5 Oct 2006 19:02:44 -0000	1.37.2.6.2.2
@@ -144,8 +144,7 @@
 
     # decode cuecat
     $barcode = cuecatbarcodedecode($barcode);
-    ( $returned, $messages, $iteminformation, $borrower ) =
-      returnbook( $barcode, $branch );
+    ( $returned, $messages, $iteminformation, $borrower ) = returnbook( $barcode, $branch );
     if ($returned) {
         $returneditems{0}    = $barcode;
         $riborrowernumber{0} = $borrower->{'borrowernumber'};
@@ -231,6 +230,7 @@
             itemauthor  => $iteminfo->{'author'},
             itembarcode => $iteminfo->{'barcode'},
             itemtype    => $iteminfo->{'itemtype'},
+			ccode    => $iteminfo->{'ccode'},
             itembiblionumber => $iteminfo->{'biblionumber'}
         );
 
@@ -259,6 +259,7 @@
             itemauthor  => $iteminfo->{'author'},
             itembarcode => $iteminfo->{'barcode'},
             itemtype    => $iteminfo->{'itemtype'},
+			ccode    => $iteminfo->{'ccode'},
             itembiblionumber => $iteminfo->{'biblionumber'},
             borsurname       => $borr->{'surname'},
             bortitle         => $borr->{'title'},
@@ -449,6 +450,7 @@
         $ri{itemtitle}        = $iteminformation->{'title'};
         $ri{itemauthor}       = $iteminformation->{'author'};
         $ri{itemtype}         = $iteminformation->{'itemtype'};
+		$ri{ccode}         = $iteminformation->{'ccode'};
         $ri{barcode}          = $barcode;
     }
     else {

Index: circ/branchtransfers.pl
===================================================================
RCS file: /sources/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.20.4.8
retrieving revision 1.20.4.8.2.1
diff -u -b -r1.20.4.8 -r1.20.4.8.2.1
--- circ/branchtransfers.pl	2 Mar 2006 22:50:53 -0000	1.20.4.8
+++ circ/branchtransfers.pl	5 Oct 2006 19:02:44 -0000	1.20.4.8.2.1
@@ -137,6 +137,7 @@
 			$item{'title'}=$iteminformation->{'title'};
 			$item{'author'}=$iteminformation->{'author'};
 			$item{'itemtype'}=$iteminformation->{'itemtype'};
+			$item{'ccode'}=$iteminformation->{'ccode'};
 			$item{'frbrname'}=$branches->{$frbranchcd}->{'branchname'};
 			$item{'tobrname'}=$branches->{$tobranchcd}->{'branchname'};
 		}
@@ -173,6 +174,7 @@
 	$item{'title'}=$iteminformation->{'title'};
 	$item{'author'}=$iteminformation->{'author'};
 	$item{'itemtype'}=$iteminformation->{'itemtype'};
+	$item{'ccode'}=$iteminformation->{'ccode'};
 	$item{'frbrname'}=$branches->{$frbcd}->{'branchname'};
 	$item{'tobrname'}=$branches->{$tobcd}->{'branchname'};
 ##########

Index: request.pl
===================================================================
RCS file: /sources/koha/koha/Attic/request.pl,v
retrieving revision 1.28.2.4
retrieving revision 1.28.2.4.2.1
diff -u -b -r1.28.2.4 -r1.28.2.4.2.1
--- request.pl	6 Feb 2006 20:12:05 -0000	1.28.2.4
+++ request.pl	5 Oct 2006 19:02:44 -0000	1.28.2.4.2.1
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: request.pl,v 1.28.2.4 2006/02/06 20:12:05 oleonard Exp $
+# $Id: request.pl,v 1.28.2.4.2.1 2006/10/05 19:02:44 kados Exp $
 
 #script to place reserves/requests
 #writen 2/1/00 by chris at katipo.oc.nz
@@ -163,6 +163,7 @@
 	$reserve{'constrainttypeo'}=($res->{'constrainttype'} eq 'o');
 	$reserve{'voldesc'}=$res->{'volumeddesc'};
 	$reserve{'itemtype'}=$res->{'itemtype'};
+	$reserve{'ccode'}=$res->{'ccode'};
 	$reserve{'branchloop'}=\@branchloop;
 	$reserve{'optionloop'}=\@optionloop;
 	push(@reserveloop,\%reserve);