Bugzilla – Attachment 11295 Details for
Bug 6151
IndependantBranches and HomeOrHoldingBranchReturn can prevent items from being checked in
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 6151 - Followup - Display message for failed returns on circulation.pl when returning via issues table.
Bug-6151---Followup---Display-message-for-failed-r.patch (text/plain), 3.42 KB, created by
Kyle M Hall (khall)
on 2012-08-02 12:27:49 UTC
(
hide
)
Description:
Bug 6151 - Followup - Display message for failed returns on circulation.pl when returning via issues table.
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2012-08-02 12:27:49 UTC
Size:
3.42 KB
patch
obsolete
>From d9f75374d2611e7a64bce6b0033dc207f737d7ca Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Thu, 2 Aug 2012 08:23:50 -0400 >Subject: [PATCH] Bug 6151 - Followup - Display message for failed returns on circulation.pl when returning via issues table. > >--- > circ/circulation.pl | 5 +++++ > .../prog/en/modules/circ/circulation.tt | 4 ++-- > .../prog/en/modules/members/moremember.tt | 2 +- > 3 files changed, 8 insertions(+), 3 deletions(-) > >diff --git a/circ/circulation.pl b/circ/circulation.pl >index 551ceba..a2d70c4 100755 >--- a/circ/circulation.pl >+++ b/circ/circulation.pl >@@ -97,6 +97,10 @@ my @failedrenews = $query->param('failedrenew'); # expected to be itemnumbers > our %renew_failed = {}; > for (@failedrenews) { $renew_failed{$_} = 1; } > >+my @failedreturns = $query->param('failedreturn'); >+our %return_failed = {}; >+for (@failedreturns) { $return_failed{$_} = 1; } >+ > my $findborrower = $query->param('findborrower'); > $findborrower =~ s|,| |g; > my $borrowernumber = $query->param('borrowernumber'); >@@ -462,6 +466,7 @@ sub build_issue_data { > $it->{'od'} = $it->{'overdue'}; > ($it->{'author'} eq '') and $it->{'author'} = ' '; > $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}}; >+ $it->{'return_failed'} = $return_failed{$it->{'itemnumber'}}; > > if ( $it->{'issuedate'} gt $todaysdate or $it->{'lastreneweddate'} gt $todaysdate ) { > (!$relatives) ? push @todaysissues, $it : push @relissues, $it; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index 6f72392..90e6231 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -741,7 +741,7 @@ No patron matched <span class="ex">[% message %]</span> > </td> > [% END %] > [% IF ( todayissue.return_failed ) %] >- <td class="problem">Checkin failed</td> >+ <td class="problem">Check-in failed</td> > [% ELSE %] > [% IF ( todayissue.renew_error_on_reserve ) %] > <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% todayissue.biblionumber %]">On hold</a> >@@ -816,7 +816,7 @@ No patron matched <span class="ex">[% message %]</span> > </td> > [% END %] > [% IF ( previssue.return_failed ) %] >- <td class="problem">Checkin failed</td> >+ <td class="problem">Check-in failed</td> > [% ELSE %] > [% IF ( previssue.renew_error_on_reserve ) %] > <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% previssue.biblionumber %]">On hold</a> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index b6df1b3..d81ef57 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -506,7 +506,7 @@ function validate1(date) { > </td> > [% END %] > [% IF ( issueloo.return_failed ) %] >- <td class="problem">Checkin failed</td> >+ <td class="problem">Check-in failed</td> > [% ELSE %] > [% IF ( issueloo.norenew_reason_on_reserve ) %] > <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% issueloo.biblionumber %]">On hold</a></td> >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6151
:
6497
|
6701
|
11250
|
11294
|
11295
|
11410
|
11585
|
11595
|
12208
|
12209
|
12210