X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=circ%2Fpendingreserves.pl;h=74cd4dfb8d3b02be96f5a14779269d5e4764bd27;hb=7e94056989abb11ab23ed7c16c364e24a2542d24;hp=04230529c86dd97d7e3f5e894c34d43b36b405b3;hpb=157b5a1eb6a530160dc7e6745ff139061cd8302b;p=koha_fer

diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index 04230529c8..74cd4dfb8d 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -45,7 +45,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { circulate => 1 },
+        flagsrequired   => { circulate => "circulate_remaining_permissions" },
         debug           => 1,
     }
 );
@@ -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);
 }
 
 
@@ -143,13 +143,13 @@ my $strsth =
 	LEFT JOIN items ON items.biblionumber=reserves.biblionumber 
 	LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber
 	LEFT JOIN branchtransfers ON items.itemnumber=branchtransfers.itemnumber
+	LEFT JOIN issues ON items.itemnumber=issues.itemnumber
  WHERE
 reserves.found IS NULL
  $sqldatewhere
 AND items.itemnumber NOT IN (SELECT itemnumber FROM branchtransfers where datearrived IS NULL)
-AND items.itemnumber NOT IN (SELECT itemnumber FROM issues)
+AND issues.itemnumber IS NULL
 AND reserves.priority <> 0 
-AND reserves.itemnumber is NULL
 AND notforloan = 0 AND damaged = 0 AND itemlost = 0 AND wthdrawn = 0
 ";
 # GROUP BY reserves.biblionumber allows only items that are not checked out, else multiples occur when