[Koha-patches] [PATCH] Bug 6121: Holds awaiting pickup

[Julian Maurice]

From: Christophe Croullebois <christophe.croullebois at biblibre.com>

On holds over, when cancelling hold and returning to his branch a bug fill the branchtransfers.tobranch field with the branchname instead of the branch code.

BibLibre MT5647
---
 circ/waitingreserves.pl                            |    3 ++-
 .../prog/en/modules/circ/waitingreserves.tmpl      |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl
index 9850114..352c9a6 100755
--- a/circ/waitingreserves.pl
+++ b/circ/waitingreserves.pl
@@ -126,7 +126,8 @@ foreach my $num (@getreserves) {
     $getreserv{'itemnumber'}     = $gettitle->{'itemnumber'};
     $getreserv{'biblionumber'}   = $gettitle->{'biblionumber'};
     $getreserv{'barcode'}        = $gettitle->{'barcode'};
-    $getreserv{'homebranch'}     = GetBranchName($gettitle->{'homebranch'});
+    $getreserv{'branchname'}     = GetBranchName($gettitle->{'homebranch'});
+    $getreserv{'homebranch'}     = $gettitle->{'homebranch'};
     $getreserv{'holdingbranch'}  = $gettitle->{'holdingbranch'};
     $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
     if ( $gettitle->{'homebranch'} ne $gettitle->{'holdingbranch'} ) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
index e25c491..44b49e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
@@ -102,7 +102,7 @@ $.tablesorter.addParser({
                             <input type="hidden" name="fbr" value="<!-- TMPL_VAR NAME="holdingbranch" -->" />
                             <input type="hidden" name="tbr" value="<!-- TMPL_VAR NAME="homebranch" -->" />
                             <!-- TMPL_IF NAME="dotransfer" -->
-                            <input type="submit" value="Cancel hold and return to : <!-- TMPL_VAR NAME="homebranch" -->" /> 
+                            <input type="submit" value="Cancel hold and return to : <!-- TMPL_VAR NAME="branchname" -->" /> 
                             <!-- TMPL_ELSE -->
                             <input type="submit" value="Cancel hold" />
                             <!-- /TMPL_IF -->
@@ -145,7 +145,7 @@ $.tablesorter.addParser({
                             <input type="hidden" name="fbr" value="<!-- TMPL_VAR NAME="holdingbranch" -->" />
                             <input type="hidden" name="tbr" value="<!-- TMPL_VAR NAME="homebranch" -->" />
                             <!-- TMPL_IF NAME="dotransfer" -->
-                            <input type="submit" value="Cancel hold and return to : <!-- TMPL_VAR NAME="homebranch" -->" />
+                            <input type="submit" value="Cancel hold and return to : <!-- TMPL_VAR NAME="branchname" -->" />
                             <!-- TMPL_ELSE -->
                             <input type="submit" value="Cancel hold" />
                             <!-- /TMPL_IF -->
-- 
1.7.4.1