[Koha-cvs] koha C4/CirculationCirc2.pm circ/circulation.pl...
LAURIN arnaud
alaurin at ouestprovence.fr
Tue Jun 6 14:26:57 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Changes by: LAURIN arnaud <alaurin> 06/06/06 12:26:57
Modified files:
C4/Circulation : Circ2.pm
circ : circulation.pl
reserve : placerequest.pl request.pl
Log message:
bug fix : for item reservation, now the system don't keep the reserve if the document is returned, works fine !!!!
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&r1=1.104&r2=1.105
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/placerequest.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/request.pl?cvsroot=koha&r1=1.2&r2=1.3
Patches:
Index: C4/Circulation/Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- C4/Circulation/Circ2.pm 1 Jun 2006 01:41:22 -0000 1.104
+++ C4/Circulation/Circ2.pm 6 Jun 2006 12:26:57 -0000 1.105
@@ -3,7 +3,7 @@
package C4::Circulation::Circ2;
-# $Id: Circ2.pm,v 1.104 2006/06/01 01:41:22 rangi Exp $
+# $Id: Circ2.pm,v 1.105 2006/06/06 12:26:57 alaurin Exp $
#package to deal with Returns
#written 3/11/99 by olwen at katipo.co.nz
@@ -1980,7 +1980,7 @@
SELECT date_due,
itemnumber
FROM issues
- WHERE itemnumber IN ('.join(',', @itemnumbers).')
+ WHERE itemnumber IN ('.join(',', @itemnumbers).') AND returndate IS NULL
';
return get_infos_of($query, 'itemnumber', 'date_due');
}
Index: circ/circulation.pl
===================================================================
RCS file: /sources/koha/koha/circ/circulation.pl,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- circ/circulation.pl 1 Jun 2006 10:03:08 -0000 1.93
+++ circ/circulation.pl 6 Jun 2006 12:26:57 -0000 1.94
@@ -138,7 +138,6 @@
if ($borrowernumber) {
$borrower = getpatroninformation( \%env, $borrowernumber, 0 );
my ( $od, $issue, $fines ) = borrdata2( \%env, $borrowernumber );
- warn $borrower->{'expiry'};
my $warningdate =
DateCalc( $borrower->{'expiry'},
"- " . C4::Context->preference('NotifyBorrowerDeparture') . " days" );
Index: reserve/placerequest.pl
===================================================================
RCS file: /sources/koha/koha/reserve/placerequest.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- reserve/placerequest.pl 19 May 2006 17:05:11 -0000 1.2
+++ reserve/placerequest.pl 6 Jun 2006 12:26:57 -0000 1.3
@@ -44,7 +44,6 @@
my $type=$input->param('type');
my $title=$input->param('title');
my $bornum=borrdata($borrower,'');
-# Nouveau developpement
my $checkitem=$input->param('checkitem');
# my $priority;
my $found;
Index: reserve/request.pl
===================================================================
RCS file: /sources/koha/koha/reserve/request.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- reserve/request.pl 19 May 2006 17:05:11 -0000 1.2
+++ reserve/request.pl 6 Jun 2006 12:26:57 -0000 1.3
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: request.pl,v 1.2 2006/05/19 17:05:11 alaurin Exp $
+# $Id: request.pl,v 1.3 2006/06/06 12:26:57 alaurin Exp $
#script to place reserves/requests
#writen 2/1/00 by chris at katipo.oc.nz
@@ -105,7 +105,7 @@
}
# we check the date expiricy of the borrower
- my $warning=Date_Cmp(ParseDate("today"),format_date($borrowerinfo->{'expiry'}));
+ my $warning=Date_Cmp(ParseDate("today"),format_date($borrowerinfo->{'dateexpiry'}));
if ( $warning > 0) {
$expiry = 1;
}
@@ -253,7 +253,7 @@
if (defined $return_date_of->{$itemnumber}) {
$date_due = format_date($return_date_of->{$itemnumber});
-
+ $item->{date_due} = $date_due;
$item->{backgroundcolor} = 'onloan';
}
More information about the Koha-cvs
mailing list