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 462-467 sub build_issue_data { Link Here
462
        $it->{'od'} = $it->{'overdue'};
466
        $it->{'od'} = $it->{'overdue'};
463
        ($it->{'author'} eq '') and $it->{'author'} = ' ';
467
        ($it->{'author'} eq '') and $it->{'author'} = ' ';
464
        $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
468
        $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
469
        $it->{'return_failed'} = $return_failed{$it->{'itemnumber'}};
465
470
466
        if ( $it->{'issuedate'} gt $todaysdate or $it->{'lastreneweddate'} gt $todaysdate ) {
471
        if ( $it->{'issuedate'} gt $todaysdate or $it->{'lastreneweddate'} gt $todaysdate ) {
467
            (!$relatives) ? push @todaysissues, $it : push @relissues, $it;
472
            (!$relatives) ? push @todaysissues, $it : push @relissues, $it;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +2 lines)
Lines 741-747 No patron matched <span class="ex">[% message %]</span> Link Here
741
        </td>
741
        </td>
742
        [% END %]
742
        [% END %]
743
  [% IF ( todayissue.return_failed ) %]
743
  [% IF ( todayissue.return_failed ) %]
744
            <td class="problem">Checkin failed</td>
744
            <td class="problem">Check-in failed</td>
745
      [% ELSE %]
745
      [% ELSE %]
746
            [% IF ( todayissue.renew_error_on_reserve ) %]
746
            [% IF ( todayissue.renew_error_on_reserve ) %]
747
               <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% todayissue.biblionumber %]">On hold</a>
747
               <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% todayissue.biblionumber %]">On hold</a>
Lines 816-822 No patron matched <span class="ex">[% message %]</span> Link Here
816
        </td>
816
        </td>
817
        [% END %]
817
        [% END %]
818
		  [% IF ( previssue.return_failed ) %]
818
		  [% IF ( previssue.return_failed ) %]
819
            <td class="problem">Checkin failed</td>
819
            <td class="problem">Check-in failed</td>
820
        [% ELSE %]
820
        [% ELSE %]
821
            [% IF ( previssue.renew_error_on_reserve ) %]
821
            [% IF ( previssue.renew_error_on_reserve ) %]
822
               <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% previssue.biblionumber %]">On hold</a>
822
               <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 506-512 function validate1(date) { Link Here
506
            </td>
506
            </td>
507
      [% END %]
507
      [% END %]
508
      [% IF ( issueloo.return_failed ) %]
508
      [% IF ( issueloo.return_failed ) %]
509
            <td class="problem">Checkin failed</td>
509
            <td class="problem">Check-in failed</td>
510
      [% ELSE %]
510
      [% ELSE %]
511
        [% IF ( issueloo.norenew_reason_on_reserve ) %]
511
        [% IF ( issueloo.norenew_reason_on_reserve ) %]
512
            <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% issueloo.biblionumber %]">On hold</a></td>
512
            <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% issueloo.biblionumber %]">On hold</a></td>
513
- 

Return to bug 6151