Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 5548 Follow up: Confirm Checkout message where it shouldn't be

Browse source 
Fixes the main Hard Due Dates conditional to first check for the existence
of $hardduedate, then the existences of its ISO export, then finally that that
value is not '0000-00-00'

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This commit is contained in:
Ian Walls 2011-04-01 13:34:35 -04:00 committed by Chris Cormack
parent 1d6fa48d19
commit 1b402c7422
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
C4/Circulation.pm
View file

@ -2710,7 +2710,7 @@ sub CalcDateDue {
# if Hard Due Dates are used, retreive them and apply as necessary # if Hard Due Dates are used, retreive them and apply as necessary
my ($hardduedate, $hardduedatecompare) = GetHardDueDate($borrower->{'categorycode'},$itemtype, $branch); my ($hardduedate, $hardduedatecompare) = GetHardDueDate($borrower->{'categorycode'},$itemtype, $branch);
if ( $hardduedate && $hardduedate->output('iso') ne '0000-00-00') { if ( $hardduedate && $hardduedate->output('iso') && $hardduedate->output('iso') ne '0000-00-00') {
# if the calculated due date is after the 'before' Hard Due Date (ceiling), override # if the calculated due date is after the 'before' Hard Due Date (ceiling), override
if ( $datedue->output( 'iso' ) gt $hardduedate->output( 'iso' ) && $hardduedatecompare == -1) { if ( $datedue->output( 'iso' ) gt $hardduedate->output( 'iso' ) && $hardduedatecompare == -1) {
$datedue = $hardduedate; $datedue = $hardduedate;