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

(-)a/C4/Letters.pm (-2 / +4 lines)
Lines 783-790 sub _parseletter { Link Here
783
    if ( $table eq 'reserves' && $values->{'waitingdate'} ) {
783
    if ( $table eq 'reserves' && $values->{'waitingdate'} ) {
784
        my @waitingdate = split /-/, $values->{'waitingdate'};
784
        my @waitingdate = split /-/, $values->{'waitingdate'};
785
785
786
        $values->{'expirationdate'} = '';
786
        if ( $values->{expirationdate} ) {
787
        if( C4::Context->preference('ExpireReservesMaxPickUpDelay') &&
787
            $values->{expirationdate} = output_pref({ dt => dt_from_string( $values->{expirationdate} ), dateonly => 1 });
788
        }
789
        elsif( C4::Context->preference('ExpireReservesMaxPickUpDelay') &&
788
        C4::Context->preference('ReservesMaxPickUpDelay') ) {
790
        C4::Context->preference('ReservesMaxPickUpDelay') ) {
789
            my $dt = dt_from_string();
791
            my $dt = dt_from_string();
790
            $dt->add( days => C4::Context->preference('ReservesMaxPickUpDelay') );
792
            $dt->add( days => C4::Context->preference('ReservesMaxPickUpDelay') );
(-)a/C4/Reserves.pm (-1 / +1 lines)
Lines 1471-1476 sub GetReserveInfo { Link Here
1471
                   reserves.biblionumber,
1471
                   reserves.biblionumber,
1472
                   reserves.branchcode,
1472
                   reserves.branchcode,
1473
                   reserves.waitingdate,
1473
                   reserves.waitingdate,
1474
                   reserves.expirationdate,
1474
                   notificationdate,
1475
                   notificationdate,
1475
                   reminderdate,
1476
                   reminderdate,
1476
                   priority,
1477
                   priority,
1477
- 

Return to bug 12204