From 1b402c742280a08572a13c92fba0518ec432013d Mon Sep 17 00:00:00 2001 From: Ian Walls Date: Fri, 1 Apr 2011 13:34:35 -0400 Subject: [PATCH] Bug 5548 Follow up: Confirm Checkout message where it shouldn't be 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 Signed-off-by: Chris Cormack --- C4/Circulation.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 22f9dc6ff6..4f55ec2095 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -2710,7 +2710,7 @@ sub CalcDateDue { # if Hard Due Dates are used, retreive them and apply as necessary 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 ( $datedue->output( 'iso' ) gt $hardduedate->output( 'iso' ) && $hardduedatecompare == -1) { $datedue = $hardduedate;