From: Christophe Croullebois <[email protected]> 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 <[email protected]> --- 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({ <input type="hidden" name="fbr" value="[% reserveloo.holdingbranch %]" /> <input type="hidden" name="tbr" value="[% reserveloo.homebranch %]" /> [% IF ( reserveloo.dotransfer ) %] - <input type="submit" value="Cancel hold and return to : [% reserveloo.homebranch %]" /> + <input type="submit" value="Cancel hold and return to : [% reserveloo.branchname %]" /> [% ELSE %] <input type="submit" value="Cancel hold" /> [% END %] @@ -129,7 +129,7 @@ $.tablesorter.addParser({ <tbody>[% FOREACH overloo IN overloop %] <tr> <td><p>[% overloo.waitingdate %]</p></td> - <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overloo.biblionumber %][% overloo.title |html %] [% overloo.subtitle |html %] + <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %][% overloo.title |html %] [% overloo.subtitle |html %] </a> [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %] (<b>[% overloo.itemtype %]</b>)[% END %][% END %] <br />Barcode: [% overloo.barcode %] @@ -145,7 +145,7 @@ $.tablesorter.addParser({ <input type="hidden" name="fbr" value="[% overloo.holdingbranch %]" /> <input type="hidden" name="tbr" value="[% overloo.homebranch %]" /> [% IF ( overloo.dotransfer ) %] - <input type="submit" value="Cancel hold and return to : [% overloo.homebranch %]" /> + <input type="submit" value="Cancel hold and return to : [% overloo.branchname %]" /> [% ELSE %] <input type="submit" value="Cancel hold" /> [% END %] -- 1.7.4.1 _______________________________________________ Koha-patches mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
