View | Details | Raw Unified | Return to bug 8004
Collapse All | Expand All

(-)a/Koha/Template/Plugin/KohaBranchName.pm (+35 lines)
Line 0 Link Here
1
package Koha::Template::Plugin::KohaBranchName;
2
3
# Copyright Bywater Solutions 2012
4
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 2 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use strict;
21
use warnings;
22
23
use Template::Plugin::Filter;
24
use base qw( Template::Plugin::Filter );
25
use warnings;
26
use strict;
27
28
use C4::Branch qw( GetBranchName );;
29
30
sub filter {
31
    my ($self,$branchcode) = @_;
32
    return GetBranchName( $branchcode );
33
}
34
35
1;
(-)a/circ/returns.pl (-1 lines)
Lines 337-343 if ( $messages->{'Wrongbranch'} ){ Link Here
337
# case of wrong transfert, if the document wasn't transfered to the right library (according to branchtransfer (tobranch) BDD)
337
# case of wrong transfert, if the document wasn't transfered to the right library (according to branchtransfer (tobranch) BDD)
338
338
339
if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) {
339
if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) {
340
    $messages->{'WrongTransfer'} = GetBranchName( $messages->{'WrongTransfer'} );
341
    $template->param(
340
    $template->param(
342
        WrongTransfer  => 1,
341
        WrongTransfer  => 1,
343
        TransferWaitingAt => $messages->{'WrongTransfer'},
342
        TransferWaitingAt => $messages->{'WrongTransfer'},
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-2 / +3 lines)
Lines 1-4 Link Here
1
[% USE KohaDates %]
1
[% USE KohaDates %]
2
[% USE KohaBranchName %]
3
2
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Circulation &rsaquo; Check in [% title |html %]</title>
5
<title>Koha &rsaquo; Circulation &rsaquo; Check in [% title |html %]</title>
4
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
Lines 87-93 function Dopop(link) { Link Here
87
</div>
89
</div>
88
[% END %]
90
[% END %]
89
<!-- case of a mistake in transfer loop -->
91
<!-- case of a mistake in transfer loop -->
90
[% IF ( WrongTransfer ) %]<div id="return2" class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% TransferWaitingAt %]</h3><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print slip</a> or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1">Cancel transfer</a></h3>
92
[% IF ( WrongTransfer ) %]<div id="return2" class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% TransferWaitingAt | $KohaBranchName %]</h3><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print slip</a> or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1">Cancel transfer</a></h3>
91
[% IF ( wborcnum ) %]<h5>Hold for:</h5>
93
[% IF ( wborcnum ) %]<h5>Hold for:</h5>
92
        <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
94
        <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
93
            [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
95
            [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
94
- 

Return to bug 8004