@@ -, +, @@ Hold until: <> --- C4/Letters.pm | 6 ++++-- C4/Reserves.pm | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) --- a/C4/Letters.pm +++ a/C4/Letters.pm @@ -806,8 +806,10 @@ sub _parseletter { if ( $table eq 'reserves' && $values->{'waitingdate'} ) { my @waitingdate = split /-/, $values->{'waitingdate'}; - $values->{'expirationdate'} = ''; - if ( C4::Context->preference('ReservesMaxPickUpDelay') ) { + if ( $values->{expirationdate} ) { + $values->{expirationdate} = output_pref({ dt => dt_from_string( $values->{expirationdate} ), dateonly => 1 }); + } + elsif ( C4::Context->preference('ReservesMaxPickUpDelay') ) { my $dt = dt_from_string(); $dt->add( days => C4::Context->preference('ReservesMaxPickUpDelay') ); $values->{'expirationdate'} = output_pref( { dt => $dt, dateonly => 1 } ); --- a/C4/Reserves.pm +++ a/C4/Reserves.pm @@ -1398,6 +1398,7 @@ sub GetReserveInfo { reserves.biblionumber, reserves.branchcode, reserves.waitingdate, + reserves.expirationdate, notificationdate, reminderdate, priority, --