From 0b4862b1334c30453be40e3aa7980781ebb9d805 Mon Sep 17 00:00:00 2001
From: Chris Cormack <crc@liblime.com>
Date: Mon, 14 Jan 2008 14:38:03 -0600
Subject: [PATCH] Finishing off bug 1427, if the person has ReturnBeforeExpiry
 set they are

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 circ/circulation.pl                                         | 3 +++
 .../intranet-tmpl/prog/en/modules/circ/circulation.tmpl     | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 124b59073c..004bd37de5 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -245,6 +245,9 @@ if ($borrowernumber) {
 		# borrower card soon to expire warn librarian
 		$template->param("warndeparture" => format_date($borrower->{dateexpiry}),
 			flagged       => "1",);
+		if ( C4::Context->preference('ReturnBeforeExpiry')){
+			$template->param("returnbeforeexpiry" => 1);
+		}
 	}
     $template->param(
         overduecount => $od,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index aaa21bcbd7..88e3e2db28 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -273,6 +273,12 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 			
 			</li>
 			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF NAME="returnbeforeexpiry" -->
+			 <li><span class="circ-hlt">Set due date to expiry:</span> You have the ReturnBeforeExpiry system preference enabled this means if the
+			 expiry date is before the date due, the date due will be set to the expiry date
+			 </li>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF NAME = "expired" -->
 			<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
-- 
2.39.5