From 22b9ead2559d0e182cc5f3a5c28f0b99fccda7d5 Mon Sep 17 00:00:00 2001
From: oleonard <oleonard>
Date: Thu, 9 Mar 2006 18:03:34 +0000
Subject: [PATCH] renaming variable so that 'branchname' can be used as current
 branch setting.  By matching circulation.pl's variable naming we can display
 branchname consistently in the header of circulation-related pages.

---
 circ/returns.pl                                      | 8 ++++----
 koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl | 8 ++++----
 koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl     | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/circ/returns.pl b/circ/returns.pl
index 616e0a6c8c..1d68dc919c 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -124,7 +124,7 @@ if ( $query->param('resbarcode') ) {
         $template->param(
             itemtitle  => $iteminfo->{'title'},
             iteminfo   => $iteminfo->{'author'},
-            branchname => $branchname,
+            tobranchname => $branchname,
             name       => $name,
             bornum     => $borrnum,
             borcnum    => $borcnum,
@@ -224,7 +224,7 @@ if ( $messages->{'ResFound'} ) {
 			debarred => $borr->{'debarred'},
 			gonenoaddress => $borr->{'gonenoaddress'},
 			currentbranch => $branches->{ $branch }->{'branchname'},
-            branchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
+            tobranchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
             waiting     => 1,
             itemnumber  => $res->{'itemnumber'},
             itemtitle   => $iteminfo->{'title'},
@@ -251,7 +251,7 @@ if ( $messages->{'ResFound'} ) {
         $template->param(
             found       => 1,
 		currentbranch => $branches->{ $branch }->{'branchname'},
-            branchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
+            tobranchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
             reserved    => 1,
             today       => $todaysdate,
             itemnumber  => $res->{'itemnumber'},
@@ -462,7 +462,7 @@ $template->param( riloop => \@riloop );
 $template->param(
     genbrname  => $branches->{$branch}->{'branchname'},
     genprname  => $printers->{$printer}->{'printername'},
-    branch     => $branch,
+    branchname     => $branches->{$branch}->{'branchname'},
     printer    => $printer,
     errmsgloop => \@errmsgloop,
     intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
diff --git a/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl
index 88527922c4..a88778d75f 100644
--- a/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl
@@ -13,7 +13,7 @@
 			<!-- TMPL_IF Name="waiting" -->
 				<h2 class="circulation">Item marked Waiting:</h2>
 			<p>Item <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->)
-		is marked waiting at <b><!-- TMPL_VAR NAME="branchname" --></b> for <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
+		is marked waiting at <b><!-- TMPL_VAR NAME="tobranchname" --></b> for <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
 					<form method="post" action="returns.pl">
 					<!-- TMPL_LOOP Name="inputloop" -->
 						<input type="hidden" name="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
@@ -28,7 +28,7 @@
 				<h2 class="circulation">Item marked Waiting:</h2>
 				<p>
 					Item: <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->)
-					needs to be transfered to <b><!-- TMPL_VAR NAME="branchname" --></b>
+					needs to be transfered to <b><!-- TMPL_VAR NAME="tobranchname" --></b>
 					to be picked up by 
 					<!-- TMPL_VAR NAME="name" --> 
 					(<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
@@ -53,7 +53,7 @@
 				<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra', 'Item'); return false;">
 					<!-- TMPL_VAR NAME="itembarcode" -->
 				</a>
-				for <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false"><!-- TMPL_VAR NAME="borcnum" --></a>) to be collected at <b><!-- TMPL_VAR NAME="branchname" --></b>.
+				for <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false"><!-- TMPL_VAR NAME="borcnum" --></a>) to be collected at <b><!-- TMPL_VAR NAME="tobranchname" --></b>.
 				</p>
 				<p>
 				Change status to waiting and print <a href="" class="circulation" onclick="alert(document.forms['f'].resslip.value); return false">slip</a>? </p>
@@ -73,7 +73,7 @@
 	ITEM RESERVED:<!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->)
 	barcode: <!-- TMPL_VAR NAME="itembarcode" -->
 	itemtype: <!-- TMPL_VAR NAME="itemtype" -->
-	COLLECT AT: <!-- TMPL_VAR NAME="branchname" -->
+	COLLECT AT: <!-- TMPL_VAR NAME="tobranchname" -->
 	
 	BORROWER:
 	<!-- TMPL_VAR NAME="bortitle" --> <!-- TMPL_VAR NAME="borfirstname" --> <!-- TMPL_VAR NAME="borsurname" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl
index e7263a58c7..b0c86db314 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl
@@ -22,7 +22,7 @@
 <!-- TMPL_IF NAME="debarred" --><li class="error">Patron is DEBARRED</li><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="gonenoaddress" --><li class="error">Patron's address is in doubt</li><!-- /TMPL_IF -->
 			</ul></td></tr>
-	<tr><!-- TMPL_IF NAME="intransit" --><th>&nbsp;</th><td><strong>Transfer</strong> to <!-- TMPL_VAR Name="branchname" --> </td><!-- TMPL_ELSE --><th>&nbsp;</th><td><strong>Hold</strong> in <!-- TMPL_VAR Name="branchname" --></td><!-- /TMPL_IF --></tr>
+	<tr><!-- TMPL_IF NAME="intransit" --><th>&nbsp;</th><td><strong>Transfer</strong> to <!-- TMPL_VAR Name="tobranchname" --> </td><!-- TMPL_ELSE --><th>&nbsp;</th><td><strong>Hold</strong> in <!-- TMPL_VAR Name="tobranchname" --></td><!-- /TMPL_IF --></tr>
 		</table></div><form method="post" action="returns.pl" name="mainform" id="mainform">
 			<input type="submit" value="Confirm" class="submit" /><!-- TMPL_LOOP Name="inputloop" -->
 				<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
@@ -70,7 +70,7 @@
 <!-- TMPL_IF NAME="debarred" --><li class="error">Patron is DEBARRED</li><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="gonenoaddress" --><li class="error">Patron's address is in doubt</li><!-- /TMPL_IF -->
 			</ul></td></tr>
-			<tr><!-- TMPL_IF NAME="intransit" --><th>&nbsp;</th><td><strong>Transfer</strong> to <!-- TMPL_VAR Name="branchname" --> </td><!-- TMPL_ELSE --><th>&nbsp;</th><td><strong>Hold</strong> in <!-- TMPL_VAR Name="branchname" --></td><!-- /TMPL_IF --></tr></table>
+			<tr><!-- TMPL_IF NAME="intransit" --><th>&nbsp;</th><td><strong>Transfer</strong> to <!-- TMPL_VAR Name="tobranchname" --> </td><!-- TMPL_ELSE --><th>&nbsp;</th><td><strong>Hold</strong> in <!-- TMPL_VAR Name="tobranchname" --></td><!-- /TMPL_IF --></tr></table>
 			</div> <form method="post" action="returns.pl" name="mainform" id="mainform">
 			<input type="submit" class="submit" value="Confirm" />
 			<!-- TMPL_LOOP Name="inputloop" -->
-- 
2.39.5