X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=circ%2Fpendingreserves.pl;h=0110debea0a02ad7612c9be7c89b8a59385c76e9;hb=80897930b73dcd17b377ce2d175a85a720117922;hp=52a045044c1b39e9b7048fdf8e603bf106dab38d;hpb=1ee7f449be2ba45c2458d2ac571172ecf58752b2;p=koha_fer

diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index 52a045044c..0110debea0 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -25,6 +25,10 @@
 
 use strict;
 #use warnings; FIXME - Bug 2505
+
+use constant TWO_DAYS => 2;
+use constant TWO_DAYS_AGO => -2;
+
 use C4::Context;
 use C4::Output;
 use CGI;
@@ -36,7 +40,7 @@ use Date::Calc qw/Today Add_Delta_YMD/;
 my $input = new CGI;
 my $startdate=$input->param('from');
 my $enddate=$input->param('to');
-my $run_report=$input->param('run_report');
+my $run_report = ( not defined $input->param('run_report') ) ? 1 : $input->param('run_report');
 
 my $theme = $input->param('theme');    # only used if allowthemeoverride is set
 
@@ -66,25 +70,24 @@ 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));
-# 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+//;
 $startdate =~ s/\s+$//;
 $enddate =~ s/^\s+//;
 $enddate =~ s/\s+$//;
-# Check if null, should string match, if so set start and end date to yesterday
+
 if (!defined($startdate) or $startdate eq "") {
+    # changed from delivered range of 10 years-yesterday to 2 days ago-today
+    # Find two days ago for the default shelf pull start date, unless HoldsToPullStartDate sys pref is set.
+    my $pastdate= sprintf("%-04.4d-%-02.2d-%02.2d", Add_Delta_YMD($year, $month, $day, 0, 0, -C4::Context->preference('HoldsToPullStartDate')||TWO_DAYS_AGO ));
     $startdate = format_date($pastdate);
 }
+
 if (!defined($enddate) or $enddate eq "") {
-    $enddate = format_date($todaysdate);
+    #similarly: calculate end date with ConfirmFutureHolds (days)
+    my $d=sprintf("%-04.4d-%-02.2d-%02.2d", Add_Delta_YMD($year, $month, $day, 0, 0, C4::Context->preference('ConfirmFutureHolds')||0 ));
+    $enddate = format_date($d);
 }
 
-
 my @reservedata;
 if ( $run_report ) {
     my $dbh    = C4::Context->dbh;
@@ -140,15 +143,17 @@ if ( $run_report ) {
     $sqldatewhere
     AND (reserves.itemnumber IS NULL OR reserves.itemnumber = items.itemnumber)
     AND items.itemnumber NOT IN (SELECT itemnumber FROM branchtransfers where datearrived IS NULL)
+    AND items.itemnumber NOT IN (select itemnumber FROM reserves where found='W')
     AND issues.itemnumber IS NULL
     AND reserves.priority <> 0 
-    AND notforloan = 0 AND damaged = 0 AND itemlost = 0 AND wthdrawn = 0
+    AND reserves.suspend = 0
+    AND notforloan = 0 AND damaged = 0 AND itemlost = 0 AND withdrawn = 0
     ";
     # GROUP BY reserves.biblionumber allows only items that are not checked out, else multiples occur when 
     #    multiple patrons have a hold on an item
 
 
-    if (C4::Context->preference('IndependantBranches')){
+    if (C4::Context->preference('IndependentBranches')){
         $strsth .= " AND items.holdingbranch=? ";
         push @query_params, C4::Context->userenv->{'branch'};
     }
@@ -161,31 +166,31 @@ if ( $run_report ) {
         push(
             @reservedata,
             {
-                reservedate      	=> format_date( $data->{l_reservedate} ),
-                priority         	=> $data->{priority},
-                name             	=> $data->{l_patron},
-                title            	=> $data->{title},
-                author           	=> $data->{author},
-                borrowernumber   	=> $data->{borrowernumber},
-                itemnum          	=> $data->{itemnumber},
-                phone            	=> $data->{phone},
-                email            	=> $data->{email},
-                biblionumber     	=> $data->{biblionumber},
-                statusw          	=> ( $data->{found} eq "W" ),
-                statusf          	=> ( $data->{found} eq "F" ),
-                holdingbranch    	=> $data->{l_holdingbranch},
-                branch           	=> $data->{l_branch},
-                itemcallnumber   	=> $data->{l_itemcallnumber},
-                enumchron        	=> $data->{l_enumchron},
-		copyno           	=> $data->{l_copynumber},
-                notes            	=> $data->{notes},
-                notificationdate 	=> $data->{notificationdate},
-                reminderdate     	=> $data->{reminderdate},
-                count			=> $data->{icount},
-                rcount			=> $data->{rcount},
-                pullcount		=> $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
-                itype			=> $data->{l_itype},
-                location		=> $data->{l_location}
+                reservedate     => format_date( $data->{l_reservedate} ),
+                priority        => $data->{priority},
+                name            => $data->{l_patron},
+                title           => $data->{title},
+                author          => $data->{author},
+                borrowernumber  => $data->{borrowernumber},
+                itemnum         => $data->{itemnumber},
+                phone           => $data->{phone},
+                email           => $data->{email},
+                biblionumber    => $data->{biblionumber},
+                statusw         => ( $data->{found} eq "W" ),
+                statusf         => ( $data->{found} eq "F" ),
+                holdingbranch   => $data->{l_holdingbranch},
+                branch          => $data->{l_branch},
+                itemcallnumber  => $data->{l_itemcallnumber},
+                enumchron       => $data->{l_enumchron},
+                copyno          => $data->{l_copynumber},
+                notes           => $data->{notes},
+                notificationdate=> $data->{notificationdate},
+                reminderdate    => $data->{reminderdate},
+                count           => $data->{icount},
+                rcount          => $data->{rcount},
+                pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
+                itype           => $data->{l_itype},
+                location        => $data->{l_location},
             }
         );
     }
@@ -193,14 +198,14 @@ if ( $run_report ) {
 }
 
 $template->param(
-    todaysdate      	=> format_date($todaysdate),
+    todaysdate          => format_date($todaysdate),
     from                => $startdate,
-    to              	=> $enddate,
+    to                  => $enddate,
     run_report          => $run_report,
-    reserveloop     	=> \@reservedata,
+    reserveloop         => \@reservedata,
     "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
-    DHTMLcalendar_dateformat =>  C4::Dates->DHTMLcalendar(),
-    dateformat    => C4::Context->preference("dateformat"),
+    HoldsToPullStartDate=> C4::Context->preference('HoldsToPullStartDate')||TWO_DAYS,
+    HoldsToPullEndDate  => C4::Context->preference('ConfirmFutureHolds')||0,
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;