From 6221260e5e39575a806872d2359a9feb8fd01665 Mon Sep 17 00:00:00 2001 From: Kyle M Hall 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 () {

Item was lost, now found.

[% END %] [% IF ( errmsgloo.withdrawn ) %] -

Item is withdrawn.

+ [% IF BlockReturnOfWithdrawnItems %] +

Cannot Check In

+

Item is withdrawn. NOT CHECKED IN

+ [% ELSE %] +

Item is withdrawn.

+ [% END %] [% END %] [% IF ( errmsgloo.debarred ) %]

[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %]) is now debarred until [% errmsgloo.debarred | $KohaDates %]

-- 1.7.2.5