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

(-)a/C4/Circulation.pm (+1 lines)
Lines 1766-1771 sub AddReturn { Link Here
1766
        else {
1766
        else {
1767
            foreach my $key ( keys %$rules ) {
1767
            foreach my $key ( keys %$rules ) {
1768
                if ( $item->{notforloan} eq $key ) {
1768
                if ( $item->{notforloan} eq $key ) {
1769
                    $messages->{'NotForLoanStatusUpdated'} = { from => $item->{notforloan}, to => $rules->{$key} };
1769
                    ModItem( { notforloan => $rules->{$key} }, undef, $itemnumber );
1770
                    ModItem( { notforloan => $rules->{$key} }, undef, $itemnumber );
1770
                    last;
1771
                    last;
1771
                }
1772
                }
(-)a/circ/returns.pl (+3 lines)
Lines 467-472 foreach my $code ( keys %$messages ) { Link Here
467
        $err{debarborrowernumber} = $borrower->{borrowernumber};
467
        $err{debarborrowernumber} = $borrower->{borrowernumber};
468
        $err{debarname}           = "$borrower->{firstname} $borrower->{surname}";
468
        $err{debarname}           = "$borrower->{firstname} $borrower->{surname}";
469
    }
469
    }
470
    elsif ( $code eq 'NotForLoanStatusUpdated' ) {
471
        $err{NotForLoanStatusUpdated} = $messages->{NotForLoanStatusUpdated};
472
    }
470
    else {
473
    else {
471
        die "Unknown error code $code";    # note we need all the (empty) elsif's above, or we die.
474
        die "Unknown error code $code";    # note we need all the (empty) elsif's above, or we die.
472
        # This forces the issue of staying in sync w/ Circulation.pm
475
        # This forces the issue of staying in sync w/ Circulation.pm
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +8 lines)
Lines 1-5 Link Here
1
[% USE KohaDates %]
1
[% USE KohaDates %]
2
[% USE Branches %]
2
[% USE Branches %]
3
[% USE AuthorisedValues %]
3
4
4
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Koha &rsaquo; Circulation &rsaquo; Check in [% title |html %]</title>
6
<title>Koha &rsaquo; Circulation &rsaquo; Check in [% title |html %]</title>
Lines 319-324 $(document).ready(function () { Link Here
319
    <div class="dialog alert">
320
    <div class="dialog alert">
320
        <h3>Check in message</h3>
321
        <h3>Check in message</h3>
321
        [% FOREACH errmsgloo IN errmsgloop %]
322
        [% FOREACH errmsgloo IN errmsgloop %]
323
                    [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
324
                        <p class="problem">
325
                            Not for loan status updated 
326
                            from <strong>[% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) %]</strong>
327
                            to <strong>[% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.to ) %]</strong>
328
                        </p>
329
                    [% END %]
322
                    [% IF ( errmsgloo.badbarcode ) %]
330
                    [% IF ( errmsgloo.badbarcode ) %]
323
                        <p class="problem">No item with barcode: [% errmsgloo.msg %]</p>
331
                        <p class="problem">No item with barcode: [% errmsgloo.msg %]</p>
324
                    [% END %]
332
                    [% END %]
325
- 

Return to bug 11629