From ed9b0c551ef1a87303c8cfbc6204ddf83dabacb6 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 14 Apr 2011 09:40:21 -0500 Subject: [PATCH] Incremental fix for Bug 3514, Returning items through patron details tab Note: Signed off with the understanding that this partial fix still doesn't compensate for items that need to be transited home (i.e. have no holds, but are not being returned at their home branch.) This behavior is much better than the old behavior, however. Hiding the "check in" checkbox for items which are on hold. This mitigates the problem of checkins not triggering holds prompts by forcing the librarian to check in these items individually. This fix should be considered temporary until a more comprehensive fix can be developed which incorporates handling for holds. Signed-off-by: Liz Rea Signed-off-by: Chris Cormack --- .../prog/en/modules/circ/circulation.tt | 16 ++++++++++++++-- .../prog/en/modules/members/moremember.tt | 4 ++++ 2 files changed, 18 insertions(+), 2 deletions(-) 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 ae5c0a664f..e63d289beb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -718,7 +718,7 @@ No patron matched [% message %] [% END %] [% IF ( todayissue.renew_error_on_reserve ) %] - On Hold + On Hold [% END %] [% IF ( todayissue.renew_error_too_many ) %] Not Renewable @@ -732,9 +732,15 @@ No patron matched [% message %] [% IF ( todayissue.return_failed ) %] Checkin Failed [% ELSE %] + [% IF ( todayissue.renew_error_on_reserve ) %] + On Hold + + + [% ELSE %] + [% END %] [% END %] [% END %] @@ -786,7 +792,7 @@ No patron matched [% message %] [% END %] [% IF ( previssue.renew_error_on_reserve ) %] - On Hold + On Hold [% END %] [% IF ( previssue.renew_error_too_many ) %] Not Renewable @@ -800,9 +806,15 @@ No patron matched [% message %] [% IF ( previssue.return_failed ) %] Checkin Failed [% ELSE %] + [% IF ( previssue.renew_error_on_reserve ) %] + On Hold + + + [% ELSE %] + [% END %] [% END %] [% END %] 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 954e4a66c3..f8073bb82d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -493,9 +493,13 @@ function validate1(date) { [% IF ( issueloo.return_failed ) %] Checkin Failed [% ELSE %] + [% IF ( issueloo.norenew_reason_on_reserve ) %] + On Hold + [% ELSE %] + [% END %] [% END %] [% END %] -- 2.39.5