From 862beea7c0135bb9e8fcb4473ea9a49110a9bc32 Mon Sep 17 00:00:00 2001
From: Jane Wagner <jwagner@ptfs.com>
Date: Fri, 19 Jun 2009 09:10:20 -0400
Subject: [PATCH] Bug # 2368 Change holds to pull default date range

Delivered range was 10 years ago to yesterday; changed default
to be two days ago to today.  Also removed notes field from report
output; 5xx fields can be quite large and including them in the
display resulted in a very lengthy printout for staff.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
---
 circ/pendingreserves.pl                                   | 8 ++++----
 .../prog/en/modules/circ/pendingreserves.tmpl             | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index 1c866eb63e..7fc02a132b 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -66,9 +66,9 @@ my $author;
 my ( $year, $month, $day ) = Today();
 my $todaysdate     = sprintf("%-04.4d-%-02.2d-%02.2d", $year, $month, $day);
 my $yesterdaysdate = sprintf("%-04.4d-%-02.2d-%02.2d", Add_Delta_YMD($year, $month, $day,   0, 0, -1));
-# Find 10 years ago for the default shelf pull start and end dates
-#    A default of the prior day's holds is a reasonable way to pull holds 
-my $pastdate       = sprintf("%-04.4d-%-02.2d-%02.2d", Add_Delta_YMD($year, $month, $day, -10, 0,  0));
+#changed from delivered range of 10 years-yesterday to 2 days ago-today
+# Find two days ago for the default shelf pull start and end dates
+my $pastdate       = sprintf("%-04.4d-%-02.2d-%02.2d", Add_Delta_YMD($year, $month, $day, 0, 0, -2));
 
 #		Predefine the start and end dates if they are not already defined
 $startdate =~ s/^\s+//;
@@ -80,7 +80,7 @@ if (!defined($startdate) or $startdate eq "") {
 	$startdate = format_date($pastdate);
 }
 if (!defined($enddate) or $enddate eq "") {
-	$enddate = format_date($yesterdaysdate);
+	$enddate = format_date($todaysdate);
 }
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
index a1ffed5a69..0876ae78f0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
@@ -107,7 +107,6 @@ $.tablesorter.addParser({
                         <!-- /TMPL_IF -->
                     <!-- /TMPL_IF -->
                     </p>
-                    <p><!-- TMPL_VAR NAME="notes" --></p>
                 </td>
             <!-- TMPL_ELSE -->
                 <td colspan="3">
@@ -206,7 +205,7 @@ Calendar.setup(
         );
 </script></li>
 </ol>
-<p><i>(Inclusive, default is 10 years ago to yesterday, set "to" to today as needed. )</i></p>
+<p><i>(Inclusive, default is two days ago to today, set other date ranges as needed. )</i></p>
 <fieldset class="action"><input type="submit" value="Submit" class="submit"/></fieldset>
 </fieldset>
 </form>
-- 
2.39.5