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

(-)a/C4/Circulation.pm (+1 lines)
Lines 1767-1772 sub AddReturn { Link Here
1767
        else {
1767
        else {
1768
            foreach my $key ( keys %$rules ) {
1768
            foreach my $key ( keys %$rules ) {
1769
                if ( $item->{notforloan} eq $key ) {
1769
                if ( $item->{notforloan} eq $key ) {
1770
                    $messages->{'NotForLoanStatusUpdated'} = { from => $item->{notforloan}, to => $rules->{$key} };
1770
                    ModItem( { notforloan => $rules->{$key} }, undef, $itemnumber );
1771
                    ModItem( { notforloan => $rules->{$key} }, undef, $itemnumber );
1771
                    last;
1772
                    last;
1772
                }
1773
                }
(-)a/circ/returns.pl (+3 lines)
Lines 504-509 foreach my $code ( keys %$messages ) { Link Here
504
    elsif ( $code eq 'PrevDebarred' ) {
504
    elsif ( $code eq 'PrevDebarred' ) {
505
        $err{prevdebarred}        = $messages->{'PrevDebarred'};
505
        $err{prevdebarred}        = $messages->{'PrevDebarred'};
506
    }
506
    }
507
    elsif ( $code eq 'NotForLoanStatusUpdated' ) {
508
        $err{NotForLoanStatusUpdated} = $messages->{NotForLoanStatusUpdated};
509
    }
507
    else {
510
    else {
508
        die "Unknown error code $code";    # note we need all the (empty) elsif's above, or we die.
511
        die "Unknown error code $code";    # note we need all the (empty) elsif's above, or we die.
509
        # This forces the issue of staying in sync w/ Circulation.pm
512
        # 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 2-7 Link Here
2
[% USE Branches %]
2
[% USE Branches %]
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE Borrowers %]
4
[% USE Borrowers %]
5
[% USE AuthorisedValues %]
5
6
6
[% INCLUDE 'doc-head-open.inc' %]
7
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Koha &rsaquo; Circulation &rsaquo; Check in [% title |html %]</title>
8
<title>Koha &rsaquo; Circulation &rsaquo; Check in [% title |html %]</title>
Lines 371-376 $(document).ready(function () { Link Here
371
    <div class="dialog alert">
372
    <div class="dialog alert">
372
        <h3>Check in message</h3>
373
        <h3>Check in message</h3>
373
        [% FOREACH errmsgloo IN errmsgloop %]
374
        [% FOREACH errmsgloo IN errmsgloop %]
375
                    [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
376
                        <p class="problem">
377
                            Not for loan status updated
378
                            from <strong>[% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) %]</strong>
379
                            to <strong>[% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.to ) %]</strong>
380
                        </p>
381
                    [% END %]
374
                    [% IF ( errmsgloo.badbarcode ) %]
382
                    [% IF ( errmsgloo.badbarcode ) %]
375
                        <p class="problem">No item with barcode: [% errmsgloo.msg %]</p>
383
                        <p class="problem">No item with barcode: [% errmsgloo.msg %]</p>
376
                    [% END %]
384
                    [% END %]
377
- 

Return to bug 11629