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

(-)a/circ/returns.pl (+15 lines)
Lines 3-8 Link Here
3
# Copyright 2000-2002 Katipo Communications
3
# Copyright 2000-2002 Katipo Communications
4
#           2006 SAN-OP
4
#           2006 SAN-OP
5
#           2007-2010 BibLibre, Paul POULAIN
5
#           2007-2010 BibLibre, Paul POULAIN
6
#           2010 Catalyst IT
6
#
7
#
7
# This file is part of Koha.
8
# This file is part of Koha.
8
#
9
#
Lines 171-176 my $barcode = $query->param('barcode'); Link Here
171
my $exemptfine  = $query->param('exemptfine');
172
my $exemptfine  = $query->param('exemptfine');
172
my $dropboxmode = $query->param('dropboxmode');
173
my $dropboxmode = $query->param('dropboxmode');
173
my $dotransfer  = $query->param('dotransfer');
174
my $dotransfer  = $query->param('dotransfer');
175
my $canceltransfer = $query->param('canceltransfer');
176
my $dest = $query->param('dest');
174
my $calendar    = C4::Calendar->new( branchcode => $userenv_branch );
177
my $calendar    = C4::Calendar->new( branchcode => $userenv_branch );
175
#dropbox: get last open day (today - 1)
178
#dropbox: get last open day (today - 1)
176
my $today       = C4::Dates->new();
179
my $today       = C4::Dates->new();
Lines 183-188 if ($dotransfer){ Link Here
183
    ModItemTransfer($transferitem, $userenv_branch, $tobranch); 
186
    ModItemTransfer($transferitem, $userenv_branch, $tobranch); 
184
}
187
}
185
188
189
if ($canceltransfer){
190
    $itemnumber=$query->param('itemnumber');
191
    DeleteTransfer($itemnumber);
192
    if($dest eq "ttr"){
193
        print $query->redirect("/cgi-bin/koha/circ/transferstoreceive.pl");
194
        exit;
195
    } else {
196
        $template->param( transfercancelled => 1);
197
    }
198
}
199
186
# actually return book and prepare item table.....
200
# actually return book and prepare item table.....
187
if ($barcode) {
201
if ($barcode) {
188
    $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace
202
    $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace
Lines 321-326 if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) { Link Here
321
        WrongTransfer  => 1,
335
        WrongTransfer  => 1,
322
        TransferWaitingAt => $messages->{'WrongTransfer'},
336
        TransferWaitingAt => $messages->{'WrongTransfer'},
323
        WrongTransferItem => $messages->{'WrongTransferItem'},
337
        WrongTransferItem => $messages->{'WrongTransferItem'},
338
        itemnumber => $itemnumber,
324
    );
339
    );
325
340
326
    my $reserve    = $messages->{'ResFound'};
341
    my $reserve    = $messages->{'ResFound'};
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +1 lines)
Lines 80-86 function Dopop(link) { Link Here
80
</div>
80
</div>
81
[% END %]
81
[% END %]
82
<!-- case of a mistake in transfer loop -->
82
<!-- case of a mistake in transfer loop -->
83
[% IF ( WrongTransfer ) %]<div 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>
83
[% IF ( WrongTransfer ) %]<div 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 %] or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1">Cancel Transfer</a></h3>
84
[% IF ( wborcnum ) %]<h5>Hold for:</h5>
84
[% IF ( wborcnum ) %]<h5>Hold for:</h5>
85
        <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
85
        <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
86
            [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
86
            [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt (-1 / +2 lines)
Lines 50-55 $(document).ready(function() { Link Here
50
                <th>On hold for</th>
50
                <th>On hold for</th>
51
                <th>Home library</th>
51
                <th>Home library</th>
52
                <th>Call no.</th>
52
                <th>Call no.</th>
53
                <th>&nbsp;</th>
53
            </tr></thead>
54
            </tr></thead>
54
            <tbody>[% FOREACH reser IN branchesloo.reserv %]
55
            <tbody>[% FOREACH reser IN branchesloo.reserv %]
55
                [% IF ( reser.messcompa ) %]
56
                [% IF ( reser.messcompa ) %]
Lines 79-84 $(document).ready(function() { Link Here
79
                    </td>
80
                    </td>
80
                    <td>[% reser.homebranch %]</td>
81
                    <td>[% reser.homebranch %]</td>
81
                    <td>[% reser.itemcallnumber %]</td>
82
                    <td>[% reser.itemcallnumber %]</td>
83
                    <td><a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% reser.itemnumber %]&amp;canceltransfer=1&amp;dest=ttr">Cancel Transfer</a></td>
82
                </tr>
84
                </tr>
83
            [% END %]</tbody>
85
            [% END %]</tbody>
84
            </table>
86
            </table>
85
- 

Return to bug 2941