Bugzilla – Attachment 10911 Details for
Bug 3387
WITHDRAWN items shouldn't check in
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 3387 - WITHDRAWN items shouldn't check in - Followup
Bug-3387---WITHDRAWN-items-shouldnt-check-in---Fol.patch (text/plain), 2.13 KB, created by
Kyle M Hall
on 2012-07-17 17:51:34 UTC
(
hide
)
Description:
Bug 3387 - WITHDRAWN items shouldn't check in - Followup
Filename:
MIME Type:
Creator:
Kyle M Hall
Created:
2012-07-17 17:51:34 UTC
Size:
2.13 KB
patch
obsolete
>From 6221260e5e39575a806872d2359a9feb8fd01665 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Tue, 17 Jul 2012 12:18:15 -0400 >Subject: [PATCH] Bug 3387 - WITHDRAWN items shouldn't check in - Followup > >--- > circ/returns.pl | 1 + > .../intranet-tmpl/prog/en/modules/circ/returns.tt | 7 ++++++- > 2 files changed, 7 insertions(+), 1 deletions(-) > >diff --git a/circ/returns.pl b/circ/returns.pl >index faaa624..14ca228 100755 >--- a/circ/returns.pl >+++ b/circ/returns.pl >@@ -604,6 +604,7 @@ $template->param( > dropboxdate => output_pref($dropboxdate), > overduecharges => $overduecharges, > soundon => C4::Context->preference("SoundOn"), >+ BlockReturnOfWithdrawnItems => C4::Context->preference("BlockReturnOfWithdrawnItems"), > ); > > ### Comment out rotating collections for now to allow it a little more time to bake >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index 1ed01f0..76ca486 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -335,7 +335,12 @@ $(document).ready(function () { > <p class="problem">Item was lost, now found.</p> > [% END %] > [% IF ( errmsgloo.withdrawn ) %] >- <p class="problem">Item is withdrawn.</p> >+ [% IF BlockReturnOfWithdrawnItems %] >+ <h3>Cannot Check In</h3> >+ <p class="problem">Item is withdrawn. <strong>NOT CHECKED IN</strong></p> >+ [% ELSE %] >+ <p class="problem">Item is withdrawn.</p> >+ [% END %] > [% END %] > [% IF ( errmsgloo.debarred ) %] > <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber %]">[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %] </p> >-- >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 3387
:
10891
|
10907
|
10911
|
10941
|
11725
|
12524