From 4a03a84a504df796a2d5eb6fb240a593a39b8b7a Mon Sep 17 00:00:00 2001 From: Christophe Croullebois Date: Tue, 8 Feb 2011 17:58:54 +0100 Subject: [PATCH 1/2] Bug 6121: Holds awaiting pickup 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 Signed-off-by: Chris Cormack Signed-off-by: Paul Poulain --- circ/waitingreserves.pl | 3 ++- .../prog/en/modules/circ/waitingreserves.tt | 6 +++--- 2 files changed, 5 insertions(+), 4 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.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt index 39400bf..6bfe480 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -102,7 +102,7 @@ $.tablesorter.addParser({ [% IF ( reserveloo.dotransfer ) %] - + [% ELSE %] [% END %] @@ -129,7 +129,7 @@ $.tablesorter.addParser({ [% FOREACH overloo IN overloop %]

[% overloo.waitingdate %]

- [% INCLUDE 'biblio-default-view.inc' biblionumber = overloo.biblionumber %][% overloo.title |html %] [% overloo.subtitle |html %] + [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %][% overloo.title |html %] [% overloo.subtitle |html %] [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]  ([% overloo.itemtype %])[% END %][% END %]
Barcode: [% overloo.barcode %] @@ -145,7 +145,7 @@ $.tablesorter.addParser({ [% IF ( overloo.dotransfer ) %] - + [% ELSE %] [% END %] -- 1.7.4.1