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

(-)a/circ/circulation.pl (+11 lines)
Lines 499-504 my $relatives_issues_count = Link Here
499
  Koha::Database->new()->schema()->resultset('Issue')
499
  Koha::Database->new()->schema()->resultset('Issue')
500
  ->count( { borrowernumber => \@relatives } );
500
  ->count( { borrowernumber => \@relatives } );
501
501
502
(my $returned, my $messages) = AddReturn( $barcode, $branch);
503
if ( $messages->{'ResFound'}) {
504
     my $reserve = $messages->{'ResFound'};
505
    # get biblio description
506
    my $biblio = GetBiblioFromItemNumber($reserve->{'itemnumber'});
507
    $template->param(
508
        reserveborrowernumber => $reserve->{'borrowernumber'},
509
        itembiblionumber => $biblio->{'biblionumber'}
510
    );
511
}
512
502
$template->param(
513
$template->param(
503
    lib_messages_loop => $lib_messages_loop,
514
    lib_messages_loop => $lib_messages_loop,
504
    bor_messages_loop => $bor_messages_loop,
515
    bor_messages_loop => $bor_messages_loop,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-8 / +13 lines)
Lines 42-48 var MSG_ADD_MESSAGE = _("Add a new message"); Link Here
42
var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
42
var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
43
[% IF ( borrowernumber ) %]if($.cookie("holdfor") != [% borrowernumber %]){ $.cookie("holdfor",null, { path: "/", expires: 0 }); }[% ELSE %]$.cookie("holdfor",null, { path: "/", expires: 0 });[% END %]
43
[% IF ( borrowernumber ) %]if($.cookie("holdfor") != [% borrowernumber %]){ $.cookie("holdfor",null, { path: "/", expires: 0 }); }[% ELSE %]$.cookie("holdfor",null, { path: "/", expires: 0 });[% END %]
44
[% UNLESS ( borrowernumber ) %][% UNLESS ( selectborrower ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]
44
[% UNLESS ( borrowernumber ) %][% UNLESS ( selectborrower ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]
45
45
function Dopop(link) {
46
    var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');
47
}
46
$(document).ready(function() {
48
$(document).ready(function() {
47
    [% IF !( CircAutoPrintQuickSlip == 'clear' ) %]
49
    [% IF !( CircAutoPrintQuickSlip == 'clear' ) %]
48
        // listen submit to trigger qslip on empty checkout
50
        // listen submit to trigger qslip on empty checkout
Lines 289-304 $(document).ready(function() { Link Here
289
[% END %]
291
[% END %]
290
292
291
[% IF ( RESERVED ) %]
293
[% IF ( RESERVED ) %]
292
<form method="get" action="/cgi-bin/koha/circ/returns.pl">
294
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
293
    <input type="hidden" name="barcode" value="[% barcode %]" />
295
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
294
    <input type="submit" class="print" value="Don't Check Out and Print Slip (P)" accesskey="p" />
296
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
297
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
298
    <input class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% reserveborrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip');this.form.submit();" value="Don't Check Out and Print Slip (P)">
295
</form>
299
</form>
296
[% END %]
300
[% END %]
297
301
298
[% IF ( RESERVE_WAITING ) %]
302
[% IF ( RESERVE_WAITING ) %]
299
<form method="get" action="/cgi-bin/koha/circ/returns.pl">
303
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
300
    <input type="hidden" name="barcode" value="[% barcode %]" />
304
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
301
    <input type="submit" class="print" value="Don't Check Out and Print Slip (P)" accesskey="p" />
305
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
306
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
307
    <input class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% reserveborrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip');this.form.submit();" value="Don't Check Out and Print Slip (P)">
302
</form>
308
</form>
303
[% END %]
309
[% END %]
304
310
305
- 

Return to bug 11882