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

(-)a/C4/Circulation.pm (-2 / +6 lines)
Lines 2485-2498 sub AddReturn { Link Here
2485
                    );
2485
                    );
2486
                }
2486
                }
2487
            } else {
2487
            } else {
2488
                my $error = "$@";
2488
                carp
2489
                carp
2489
                    "The checkin for the following issue failed, Please go to the about page and check all messages on the 'System information' to see if there are configuration / data issues ($@)"
2490
                    "The checkin for the following issue failed, Please go to the about page and check all messages on the 'System information' to see if there are configuration / data issues, or see the specific message in parentheses ($@)"
2490
                    . Dumper( $issue->unblessed );
2491
                    . Dumper( $issue->unblessed );
2491
2492
2492
                my $indexer = Koha::SearchEngine::Indexer->new( { index => $Koha::SearchEngine::BIBLIOS_INDEX } );
2493
                my $indexer = Koha::SearchEngine::Indexer->new( { index => $Koha::SearchEngine::BIBLIOS_INDEX } );
2493
                $indexer->index_records( $item->biblionumber, "specialUpdate", "biblioserver" );
2494
                $indexer->index_records( $item->biblionumber, "specialUpdate", "biblioserver" );
2494
2495
2495
                return ( 0, { WasReturned => 0, DataCorrupted => 1 }, $issue, $patron_unblessed );
2496
                return (
2497
                    0, { WasReturned => 0, DataCorrupted => $error }, $issue,
2498
                    $patron_unblessed
2499
                );
2496
            }
2500
            }
2497
2501
2498
            # FIXME is the "= 1" right?  This could be the borrower hash.
2502
            # FIXME is the "= 1" right?  This could be the borrower hash.
(-)a/circ/returns.pl (-1 / +1 lines)
Lines 758-764 foreach my $code ( keys %$messages ) { Link Here
758
    } elsif ( $code eq 'NotForLoanStatusUpdated' ) {
758
    } elsif ( $code eq 'NotForLoanStatusUpdated' ) {
759
        $err{NotForLoanStatusUpdated} = $messages->{NotForLoanStatusUpdated};
759
        $err{NotForLoanStatusUpdated} = $messages->{NotForLoanStatusUpdated};
760
    } elsif ( $code eq 'DataCorrupted' ) {
760
    } elsif ( $code eq 'DataCorrupted' ) {
761
        $err{data_corrupted} = 1;
761
        $err{data_corrupted} = $messages->{'DataCorrupted'};
762
    } elsif ( $code eq 'ReturnClaims' ) {
762
    } elsif ( $code eq 'ReturnClaims' ) {
763
        $template->param( ReturnClaims => $messages->{ReturnClaims} );
763
        $template->param( ReturnClaims => $messages->{ReturnClaims} );
764
    } elsif ( $code eq 'ClaimAutoResolved' ) {
764
    } elsif ( $code eq 'ClaimAutoResolved' ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-6 / +6 lines)
Lines 399-409 Link Here
399
                    [% IF ( errmsgloo.foreverdebarred ) %]
399
                    [% IF ( errmsgloo.foreverdebarred ) %]
400
                        <p class="problem ret_foreverdebarred"><strong>Reminder: </strong>Patron has an indefinite restriction.</p>
400
                        <p class="problem ret_foreverdebarred"><strong>Reminder: </strong>Patron has an indefinite restriction.</p>
401
                    [% END %]
401
                    [% END %]
402
                    [% IF errmsgloo.data_corrupted %]
402
                    [% IF ( errmsgloo.data_corrupted ) %]
403
                        <p class="problem ret_datacorrupt"
403
                        <p class="problem ret_datacorrupt">
404
                            >The item has not been checked in due to a configuration issue in your system. You must ask an administrator to take a look at the <a href="/cgi-bin/koha/about.pl#sysinfo_panel">about page</a> and correct all
404
                            The item has not been checked in due to an issue in your system. Note the error below. An administrator may find further details by looking at the <a href="/cgi-bin/koha/about.pl#sysinfo_panel">about page</a> and
405
                            errors shown on the "System information" tab</p
405
                            correcting errors shown on the "System information" tab, or note the error below.
406
                        >
406
                        </p>
407
                        <p class="problem ret_error_message"> Error: ([% errmsgloo.data_corrupted | html %]) </p>
407
                    [% END %]
408
                    [% END %]
408
                [% END # /FOREACH errmsgloo %]
409
                [% END # /FOREACH errmsgloo %]
409
            </div>
410
            </div>
410
- 

Return to bug 40708