View | Details | Raw Unified | Return to bug 19626
Collapse All | Expand All

(-)a/installer/data/mysql/updatedatabase.pl (-5 / +4 lines)
Lines 14370-14381 if( CheckVersion( $DBversion ) ) { Link Here
14370
            $requested_expiration = dt_from_string($hold->expirationdate);
14370
            $requested_expiration = dt_from_string($hold->expirationdate);
14371
        }
14371
        }
14372
14372
14373
        my $calendar = Koha::Calendar->new( branchcode => $hold->branchcode );
14374
        my $expirationdate = dt_from_string($hold->waitingdate);
14373
        my $expirationdate = dt_from_string($hold->waitingdate);
14375
        $expirationdate->add(days => $max_pickup_delay);
14376
14377
        if ( C4::Context->preference("ExcludeHolidaysFromMaxPickUpDelay") ) {
14374
        if ( C4::Context->preference("ExcludeHolidaysFromMaxPickUpDelay") ) {
14378
            $expirationdate = $calendar->days_forward( dt_from_string($hold->waitingdate), $max_pickup_delay );
14375
            my $calendar = Koha::Calendar->new( branchcode => $hold->branchcode );
14376
            $expirationdate = $calendar->days_forward( $expirationdate, $max_pickup_delay );
14377
        } else {
14378
            $expirationdate->add( days => $max_pickup_delay );
14379
        }
14379
        }
14380
14380
14381
        my $cmp = $requested_expiration ? DateTime->compare($requested_expiration, $expirationdate) : 0;
14381
        my $cmp = $requested_expiration ? DateTime->compare($requested_expiration, $expirationdate) : 0;
14382
- 

Return to bug 19626