--- a/Koha/Template/Plugin/KohaBranchName.pm +++ a/Koha/Template/Plugin/KohaBranchName.pm @@ -0,0 +1,35 @@ +package Koha::Template::Plugin::KohaBranchName; + +# Copyright Bywater Solutions 2012 + +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use strict; +use warnings; + +use Template::Plugin::Filter; +use base qw( Template::Plugin::Filter ); +use warnings; +use strict; + +use C4::Branch qw( GetBranchName );; + +sub filter { + my ($self,$branchcode) = @_; + return GetBranchName( $branchcode ); +} + +1; --- a/circ/returns.pl +++ a/circ/returns.pl @@ -337,7 +337,6 @@ if ( $messages->{'Wrongbranch'} ){ # case of wrong transfert, if the document wasn't transfered to the right library (according to branchtransfer (tobranch) BDD) if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) { - $messages->{'WrongTransfer'} = GetBranchName( $messages->{'WrongTransfer'} ); $template->param( WrongTransfer => 1, TransferWaitingAt => $messages->{'WrongTransfer'}, --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -1,4 +1,6 @@ [% USE KohaDates %] +[% USE KohaBranchName %] + [% INCLUDE 'doc-head-open.inc' %] Koha › Circulation › Check in [% title |html %] [% INCLUDE 'doc-head-close.inc' %] @@ -87,7 +89,7 @@ function Dopop(link) { [% END %] -[% IF ( WrongTransfer ) %]

Please return [% title |html %] to [% TransferWaitingAt %]

Print slip or Cancel transfer

+[% IF ( WrongTransfer ) %]

Please return [% title |html %] to [% TransferWaitingAt | $KohaBranchName %]

Print slip or Cancel transfer

[% IF ( wborcnum ) %]
Hold for: