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

(-)a/C4/Circulation.pm (-2 / +6 lines)
Lines 2380-2393 sub AddReturn { Link Here
2380
                    );
2380
                    );
2381
                }
2381
                }
2382
            } else {
2382
            } else {
2383
                my $error = "$@";
2383
                carp
2384
                carp
2384
                    "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 ($@)"
2385
                    "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 ($@)"
2385
                    . Dumper( $issue->unblessed );
2386
                    . Dumper( $issue->unblessed );
2386
2387
2387
                my $indexer = Koha::SearchEngine::Indexer->new( { index => $Koha::SearchEngine::BIBLIOS_INDEX } );
2388
                my $indexer = Koha::SearchEngine::Indexer->new( { index => $Koha::SearchEngine::BIBLIOS_INDEX } );
2388
                $indexer->index_records( $item->biblionumber, "specialUpdate", "biblioserver" );
2389
                $indexer->index_records( $item->biblionumber, "specialUpdate", "biblioserver" );
2389
2390
2390
                return ( 0, { WasReturned => 0, DataCorrupted => 1 }, $issue, $patron_unblessed );
2391
                return (
2392
                    0, { WasReturned => 0, DataCorrupted => 1, ErrorMessage => $error }, $issue,
2393
                    $patron_unblessed
2394
                );
2391
            }
2395
            }
2392
2396
2393
            # FIXME is the "= 1" right?  This could be the borrower hash.
2397
            # FIXME is the "= 1" right?  This could be the borrower hash.
(-)a/circ/returns.pl (+2 lines)
Lines 731-736 foreach my $code ( keys %$messages ) { Link Here
731
        $err{NotForLoanStatusUpdated} = $messages->{NotForLoanStatusUpdated};
731
        $err{NotForLoanStatusUpdated} = $messages->{NotForLoanStatusUpdated};
732
    } elsif ( $code eq 'DataCorrupted' ) {
732
    } elsif ( $code eq 'DataCorrupted' ) {
733
        $err{data_corrupted} = 1;
733
        $err{data_corrupted} = 1;
734
    } elsif ( $code eq 'ErrorMessage' ) {
735
        $err{error_message} = $messages->{'ErrorMessage'};
734
    } elsif ( $code eq 'ReturnClaims' ) {
736
    } elsif ( $code eq 'ReturnClaims' ) {
735
        $template->param( ReturnClaims => $messages->{ReturnClaims} );
737
        $template->param( ReturnClaims => $messages->{ReturnClaims} );
736
    } elsif ( $code eq 'ClaimAutoResolved' ) {
738
    } elsif ( $code eq 'ClaimAutoResolved' ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-5 / +9 lines)
Lines 400-409 Link Here
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.</br>
405
                            errors shown on the "System information" tab</p
405
                        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 errors shown on the "System information" tab or note the error below.
406
                        >
406
                        </p>
407
                    [% END %]
408
                    [% IF errmsgloo.error_message %]
409
                        <p class="problem ret_error_message">
410
                        Error: ([% errmsgloo.error_message | html %])</br>
411
                        </p>
407
                    [% END %]
412
                    [% END %]
408
                [% END # /FOREACH errmsgloo %]
413
                [% END # /FOREACH errmsgloo %]
409
            </div>
414
            </div>
410
- 

Return to bug 40708