From 6ea3cdf76a6b0b89b89bc2ddbe5d7bbf58d1feea Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 13 Apr 2015 13:21:49 +0200 Subject: [PATCH] Bug 7981: Use The Branches TT plugin instead of GetBranchName Note that homebranchname is never used in the template. Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart --- circ/returns.pl | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/circ/returns.pl b/circ/returns.pl index 7e601a4..1e221ee 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -272,9 +272,7 @@ if ($barcode) { $template->param( title => $biblio->{'title'}, homebranch => $biblio->{'homebranch'}, - homebranchname => GetBranchName( $biblio->{'homebranch'} ), returnbranch => $returnbranch, - returnbranchname => GetBranchName( $returnbranch ), author => $biblio->{'author'}, itembarcode => $biblio->{'barcode'}, itemtype => $biblio->{'itemtype'}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 1b2aec6..a831c80 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -277,7 +277,7 @@ $(document).ready(function () { [% IF ( transfer ) %]
-

Please return [% title or "item" |html %] to [% returnbranchname %]
( Print slip )

+

Please return [% title or "item" |html %] to [% Branches.GetName( returnbranchname ) %]
( Print slip )

[% IF ( soundon ) %] @@ -289,7 +289,7 @@ $(document).ready(function () { [% IF ( soundon ) %] [% END %] -

This item needs to be transferred to [% returnbranchname %]

+

This item needs to be transferred to [% Branches.GetName( returnbranchname ) %]

Transfer now?
[% IF itemnumber %] -- 2.1.0