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

(-)a/circ/circulation.pl (+5 lines)
Lines 97-102 my @failedrenews = $query->param('failedrenew'); # expected to be itemnumbers Link Here
97
our %renew_failed = {};
97
our %renew_failed = {};
98
for (@failedrenews) { $renew_failed{$_} = 1; }
98
for (@failedrenews) { $renew_failed{$_} = 1; }
99
99
100
my @failedreturns = $query->param('failedreturn');
101
our %return_failed = {};
102
for (@failedreturns) { $return_failed{$_} = 1; }
103
100
my $findborrower = $query->param('findborrower');
104
my $findborrower = $query->param('findborrower');
101
$findborrower =~ s|,| |g;
105
$findborrower =~ s|,| |g;
102
my $borrowernumber = $query->param('borrowernumber');
106
my $borrowernumber = $query->param('borrowernumber');
Lines 460-465 sub build_issue_data { Link Here
460
        $it->{'od'} = $it->{'overdue'};
464
        $it->{'od'} = $it->{'overdue'};
461
        ($it->{'author'} eq '') and $it->{'author'} = ' ';
465
        ($it->{'author'} eq '') and $it->{'author'} = ' ';
462
        $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
466
        $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
467
        $it->{'return_failed'} = $return_failed{$it->{'itemnumber'}};
463
468
464
        if ( $it->{'issuedate'} gt $todaysdate or $it->{'lastreneweddate'} gt $todaysdate ) {
469
        if ( $it->{'issuedate'} gt $todaysdate or $it->{'lastreneweddate'} gt $todaysdate ) {
465
            (!$relatives) ? push @todaysissues, $it : push @relissues, $it;
470
            (!$relatives) ? push @todaysissues, $it : push @relissues, $it;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +1 lines)
Lines 900-906 No patron matched <span class="ex">[% message %]</span> Link Here
900
        </td>
900
        </td>
901
        [% END %]
901
        [% END %]
902
		  [% IF ( previssue.return_failed ) %]
902
		  [% IF ( previssue.return_failed ) %]
903
            <td class="problem">Checkin failed</td>
903
            <td class="problem">Check-in failed</td>
904
        [% ELSE %]
904
        [% ELSE %]
905
            [% IF ( previssue.renew_error_on_reserve ) %]
905
            [% IF ( previssue.renew_error_on_reserve ) %]
906
               <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% previssue.biblionumber %]">On hold</a>
906
               <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% previssue.biblionumber %]">On hold</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-2 / +1 lines)
Lines 498-504 function validate1(date) { Link Here
498
            </td>
498
            </td>
499
      [% END %]
499
      [% END %]
500
      [% IF ( issueloo.return_failed ) %]
500
      [% IF ( issueloo.return_failed ) %]
501
            <td class="problem">Checkin failed</td>
501
            <td class="problem">Check-in failed</td>
502
      [% ELSE %]
502
      [% ELSE %]
503
        [% IF ( issueloo.norenew_reason_on_reserve ) %]
503
        [% IF ( issueloo.norenew_reason_on_reserve ) %]
504
            <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% issueloo.biblionumber %]">On hold</a></td>
504
            <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% issueloo.biblionumber %]">On hold</a></td>
505
- 

Return to bug 6151